From 5232a12ebd1e375b1cf2fb6944d4d5b3efcaff12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nitzsche?= <rene@system25.de>
Date: Sat, 9 Dec 2023 12:16:09 +0100
Subject: [PATCH] Feature/support for content security policy header  (#341)

* #340 add support for security policy header
* #340 change reload events for form input elements
* #340 fix unit tests
* #340 add flash message to DocumentTemplate
* #340 createNewButton is alias of createNewLink
* #340 improve button hover text
* #340 fix tce links for older t3 versions
---
 CHANGELOG.md                                  |   7 +
 Classes/Backend/Decorator/BaseDecorator.php   |   5 +-
 .../Form/Element/EnhancedLinkButton.php       | 127 ++++
 Classes/Backend/Form/FormBuilder.php          |   2 +-
 Classes/Backend/Form/ToolBox.php              | 607 +++++++++++-------
 Classes/Backend/Module/BaseModule.php         |  10 +-
 Classes/Backend/Template/ModuleTemplate.php   |  18 -
 .../Template/Override/DocumentTemplate.php    |  93 ++-
 Classes/Backend/Utility/BackendUtility.php    |  37 +-
 Classes/Backend/Utility/IconMap.php           | 213 ++++++
 Classes/Backend/Utility/Icons.php             |  19 +-
 Classes/Frontend/Request/Parameters.php       |  14 +-
 Classes/Utility/Strings.php                   |  16 +-
 Classes/Utility/T3General.php                 |  22 +
 Classes/Utility/TYPO3.php                     |  10 +
 Configuration/JavaScriptModules.php           |  10 +
 Resources/Public/JavaScript/Toolbox.js        |  60 ++
 Resources/Public/JavaScript/es6/toolbox.js    |  59 ++
 composer.json                                 |   3 +-
 tests/Classes/Backend/Form/ToolBoxTest.php    | 112 ++--
 20 files changed, 1080 insertions(+), 364 deletions(-)
 create mode 100644 Classes/Backend/Form/Element/EnhancedLinkButton.php
 create mode 100644 Classes/Backend/Utility/IconMap.php
 create mode 100644 Configuration/JavaScriptModules.php
 create mode 100644 Resources/Public/JavaScript/Toolbox.js
 create mode 100644 Resources/Public/JavaScript/es6/toolbox.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48dd2a0a..9ce823e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ v1.18.0 (??.11.2023)
 * BC: Parameter type of exceptions changed in ExceptionHandlerInterface to \Throwable
 * Share ViewContext instance of current configuration with current request
 * Fixed some PHP 8 issues
+* Support for activated content security policy header in backend modules
+* Improved icon support in backend modules
+* BC: impossible to use HTML-Code in title parameter of ToolBox::createModuleLink(). Most likely this was done for icon code. As fix provide icon as option ToolBox::OPTION_ICON_NAME.
+* BC: removed public attributes `JScode` and `JScodeArray` in `Sys25\RnBase\Backend\Template\Override\DocumentTemplate`
+* Support for FlashMessage via `DocumentTemplate::showFlashMessage()`
+* Method `rmFromList` added to `T3General`
+* Possible BC: `ToolBox::createNewButton()` is now alias of `ToolBox::createNewLink()`
 
 v1.17.4 (22.09.2023)
 
diff --git a/Classes/Backend/Decorator/BaseDecorator.php b/Classes/Backend/Decorator/BaseDecorator.php
index f1715efd..39e0f791 100644
--- a/Classes/Backend/Decorator/BaseDecorator.php
+++ b/Classes/Backend/Decorator/BaseDecorator.php
@@ -11,7 +11,6 @@
 use Sys25\RnBase\Domain\Model\DataInterface;
 use Sys25\RnBase\Domain\Model\DataModel;
 use Sys25\RnBase\Domain\Model\DomainModelInterface as DomainInterface;
-use Sys25\RnBase\Domain\Model\RecordInterface;
 use Sys25\RnBase\Utility\Strings;
 use Sys25\RnBase\Utility\TYPO3;
 
@@ -427,11 +426,11 @@ protected function formatActionMovedown(
     /**
      * Returns the uid map and sets the pointer to the current element.
      *
-     * @param RecordInterface $item
+     * @param DomainInterface $item
      *
      * @return array
      */
-    protected function getUidMap(RecordInterface $item)
+    protected function getUidMap(DomainInterface $item)
     {
         if (!$this->getOptions()->hasUidMap()) {
             return [];
diff --git a/Classes/Backend/Form/Element/EnhancedLinkButton.php b/Classes/Backend/Form/Element/EnhancedLinkButton.php
new file mode 100644
index 00000000..322423ca
--- /dev/null
+++ b/Classes/Backend/Form/Element/EnhancedLinkButton.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Sys25\RnBase\Backend\Form\Element;
+
+use Sys25\RnBase\Utility\T3General;
+use TYPO3\CMS\Backend\Template\Components\Buttons\LinkButton;
+
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 2023 Rene Nitzsche (rene@system25.de)
+*  All rights reserved
+*
+*  This script is part of the TYPO3 project. The TYPO3 project is
+*  free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+/**
+ * Erweitert den LinkButton von TYPO3 um zusätzliche Funktionen.
+ * - man kann links ohne Icon setzen
+ * - der Hover-Tooltip kann abweichend vom Label sein
+ * - die default btn-CSS-Klassen können komplett ersetzt werden.
+ */
+class EnhancedLinkButton extends LinkButton
+{
+    private $overrideCss = true;
+
+    public function addDataAttributes(array $dataAttributes)
+    {
+        $this->dataAttributes = array_merge($this->dataAttributes, $dataAttributes);
+    }
+
+    /**
+     * If set given css classes will override default button classes.
+     *
+     * @param bool $value
+     *
+     * @return LinkButton
+     */
+    public function setOverrideCss($value)
+    {
+        $this->overrideCss = (bool) $value;
+
+        return $this;
+    }
+
+    /**
+     * hover tooltip attribute of the link.
+     *
+     * @var string
+     */
+    private $hoverText = '';
+
+    /**
+     * Get hoverText.
+     *
+     * @return string
+     */
+    public function getHoverText()
+    {
+        return ''.$this->hoverText;
+    }
+
+    /**
+     * Set tooltip text.
+     *
+     * @param string $value hover text
+     *
+     * @return LinkButton
+     */
+    public function setHoverText($value)
+    {
+        $this->hoverText = $value;
+
+        return $this;
+    }
+
+    /**
+     * Renders the markup for the button.
+     *
+     * @return string
+     */
+    public function render()
+    {
+        $cssClasses = 'btn btn-default btn-sm ';
+        if ($this->overrideCss && !empty($this->getClasses())) {
+            $cssClasses = '';
+        }
+
+        $attributes = [
+            'href' => $this->getHref(),
+            'class' => trim($cssClasses.$this->getClasses()),
+            'title' => $this->getHoverText() ?: $this->getTitle(),
+        ];
+        $labelText = '';
+        if ($this->showLabelText) {
+            $labelText = ' '.$this->title;
+        }
+        foreach ($this->dataAttributes as $attributeName => $attributeValue) {
+            $attributes['data-'.$attributeName] = $attributeValue;
+        }
+        if (method_exists($this, 'isDisabled') && $this->isDisabled()) {
+            $attributes['disabled'] = 'disabled';
+            $attributes['class'] .= ' disabled';
+        }
+        $attributesString = T3General::implodeAttributes($attributes, true);
+
+        $icon = $this->getIcon() ? $this->getIcon()->render() : '';
+
+        return '<a '.$attributesString.'>'
+            .trim($icon.htmlspecialchars($labelText))
+            .'</a>';
+    }
+}
diff --git a/Classes/Backend/Form/FormBuilder.php b/Classes/Backend/Form/FormBuilder.php
index 886e7e6b..ccdbd23b 100644
--- a/Classes/Backend/Form/FormBuilder.php
+++ b/Classes/Backend/Form/FormBuilder.php
@@ -97,7 +97,7 @@ protected function isNEWRecord($uid)
      * @param string $uid
      * @param array  $record should contain pid and other default values for record
      *
-     * @return multitype:
+     * @return array
      */
     protected function compileFormData($table, $uid, $record)
     {
diff --git a/Classes/Backend/Form/ToolBox.php b/Classes/Backend/Form/ToolBox.php
index a8b7f249..41f98f6f 100644
--- a/Classes/Backend/Form/ToolBox.php
+++ b/Classes/Backend/Form/ToolBox.php
@@ -2,6 +2,7 @@
 
 namespace Sys25\RnBase\Backend\Form;
 
+use Sys25\RnBase\Backend\Form\Element\EnhancedLinkButton;
 use Sys25\RnBase\Backend\Form\Element\InputText;
 use Sys25\RnBase\Backend\Module\IModule;
 use Sys25\RnBase\Backend\Template\Override\DocumentTemplate;
@@ -13,9 +14,10 @@
 use Sys25\RnBase\Utility\Math;
 use Sys25\RnBase\Utility\Misc;
 use Sys25\RnBase\Utility\Strings;
-use Sys25\RnBase\Utility\T3General as T3GeneralAlias;
+use Sys25\RnBase\Utility\T3General;
 use Sys25\RnBase\Utility\TYPO3;
 use tx_rnbase;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\JavaScriptModuleInstruction;
 
 /***************************************************************
@@ -56,6 +58,9 @@ class ToolBox
      */
     private $module;
 
+    /**
+     * @var DocumentTemplate
+     */
     protected $doc;
 
     public const CSS_CLASS_BTN = 'btn btn-default btn-sm';
@@ -66,8 +71,13 @@ class ToolBox
     public const OPTION_TITLE = 'title';
 
     public const OPTION_CONFIRM = 'confirm';
+    public const OPTION_ICON_NAME = 'icon';
+    public const OPTION_HOVER_TEXT = 'hover';
+    public const OPTION_HIDE_LABEL = 'hide-label';
 
     public const OPTION_PARAMS = 'params';
+    public const OPTION_CSS_CLASSES = 'class';
+    public const OPTION_DATA_ATTR = 'data-attr';
 
     /**
      * Clipboard object.
@@ -76,6 +86,11 @@ class ToolBox
      */
     private $clipObj;
     private $tceStack;
+    /** @var LanguageService */
+    private $lang;
+
+    /** @var \TYPO3\CMS\Backend\Routing\UriBuilder */
+    private $uriBuilder;
 
     /**
      * @param DocumentTemplate $doc
@@ -83,14 +98,15 @@ class ToolBox
      */
     public function init(DocumentTemplate $doc, IModule $module)
     {
-        global $BACK_PATH;
         $this->doc = $doc;
         $this->module = $module;
+        $this->lang = $module->getLanguageService();
+
+        $this->uriBuilder = tx_rnbase::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
 
         // TCEform für das Formular erstellen
         $this->form = tx_rnbase::makeInstance(FormBuilder::class);
         $this->form->initDefaultBEmode();
-        $this->form->backPath = $BACK_PATH;
     }
 
     /**
@@ -140,147 +156,173 @@ public function createEditButton($editTable, $editUid, $options = [])
     }
 
     /**
-     * Erstellt einen Link zur Bearbeitung eines Datensatzes.
+     * Creates a Link to show an item in frontend.
      *
-     * @param string $editTable DB-Tabelle des Datensatzes
-     * @param int    $editUid   UID des Datensatzes
-     * @param string $label     Bezeichnung des Links
+     * @param $pid
+     * @param $label
+     * @param string $urlParams
      * @param array  $options
      *
      * @return string
      */
-    public function createEditLink($editTable, $editUid, $label = 'Edit', $options = [])
+    public function createShowLink($pid, $label, $urlParams = '', $options = [])
     {
-        $params = '&edit['.$editTable.']['.$editUid.']=edit';
+        if ($options['sprite'] ?? false) {
+            $label = Icons::getSpriteIcon($options['sprite']);
+        }
+        $jsCode = BackendUtility::viewOnClick($pid, '', null, '', '', $urlParams);
+        $title = '';
+        if ($options['hover'] ?? false) {
+            $title = ' title="'.$options['hover'].'" ';
+        }
+
         $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
         $class = ' class="'.$class.'"';
-        $label = isset($options['label']) ? $options['label'] : $label;
-        $onClick = htmlspecialchars(BackendUtility::editOnClick($params));
 
-        return '<a href="#" '.$class.' onclick="'.$onClick.'" title="Edit UID: '.$editUid.'">'
-                .Icons::getSpriteIcon('actions-page-open')
-                .$label
-                .'</a>';
+        return '<a href="#" '.$class.' onclick="'.htmlspecialchars($jsCode).'" '.$title.'>'.$label.'</a>';
     }
 
     /**
-     * Erstellt einen History-Link
-     * Achtung: Benötigt die JS-Funktion jumpExt() in der Seite.
-     *
-     * @param string $table
-     * @param int    $recordUid
-     *
-     * @return string
+     * @return EnhancedLinkButton
      */
-    public function createHistoryLink($table, $recordUid, $label = '')
+    private function makeLinkButton($uri, $label = '')
     {
-        $this->addBaseInlineJSCode();
-        $image = Icons::getSpriteIcon('actions-document-history-open');
-        $moduleUrl = BackendUtility::getModuleUrl('record_history', ['element' => $table.':'.$recordUid]);
-        $onClick = 'return jumpExt('.Strings::quoteJSvalue($moduleUrl).',\'#latest\');';
+        $btn = new EnhancedLinkButton();
+        $btn->setHref($uri);
+        if ($label) {
+            $btn->setTitle($label)
+                ->setShowLabelText(true);
+        }
 
-        return '<a class="btn btn-default" href="#" onclick="'.htmlspecialchars($onClick).'" title="'
-            .htmlspecialchars($GLOBALS['LANG']->getLL('history')).'">'
-            .$image.'</a>';
+        return $btn;
     }
 
     /**
-     * Creates a new-record-button.
+     * Erstellt einen Link zur Erstellung eines neuen Datensatzes
+     * Possible options:
+     * - params: some plain url params like "&myparam=4"
+     * - title: label for this link
+     * - confirm: some confirm message
+     * - defvals: an array for defVals like this: ['mytable' => ['myfield' => 'initialvalue', ]]
+     * - class: css class for a tag. default is "btn btn-default btn-sm".
      *
-     * @param string $table
-     * @param int    $pid
+     * @param string $table   DB-Tabelle des Datensatzes
+     * @param int    $pid     UID der Zielseite
+     * @param string $label   Bezeichnung des Links
      * @param array  $options
      *
      * @return string
      */
-    public function createNewButton($table, $pid, $options = [])
+    public function createNewLink($table, $pid, $label = 'New', $options = [])
     {
-        $params = '&edit['.$table.']['.$pid.']=new';
-        if (isset($options[self::OPTION_PARAMS])) {
-            $params .= $options[self::OPTION_PARAMS];
-        }
-        $params .= $this->buildDefVals($options);
-        $title = isset($options[self::OPTION_TITLE]) ? $options[self::OPTION_TITLE] : $GLOBALS['LANG']->getLL('new', 1);
-        $name = isset($options['name']) ? $options['params'] : '';
+        $uri = $this->buildEditUri($table, $pid, 'new', $options);
+        $uri .= $this->buildDefVals($options);
+
+        $image = Icons::getSpriteIcon('actions-document-new', ['asIcon' => true]);
+        $recordButton = $this->makeLinkButton($uri, $label)
+            ->setIcon($image);
+
+        $recordButton->setHoverText($this->getHoverText($options) ?: $label);
+        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : '';
 
-        $jsCode = BackendUtility::editOnClick($params);
         if (isset($options[self::OPTION_CONFIRM]) && strlen($options[self::OPTION_CONFIRM]) > 0) {
-            $jsCode = 'if(confirm('.Strings::quoteJSvalue($options[self::OPTION_CONFIRM]).')) {'.$jsCode.'} else {return false;}';
+            $class .= ' t3js-modal-trigger';
+            $recordButton->setDataAttributes(['content' => $options[self::OPTION_CONFIRM]]);
+            $recordButton->setOverrideCss(false);
         }
+        $recordButton->setClasses($class);
 
-        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
-        $class = ' class="'.$class.'"';
-
-        $btn = '<input type="button" name="'.$name.'" value="'.$title.'" '.$class;
-        $btn .= ' onclick="'.htmlspecialchars($jsCode, -1).'"';
-        $btn .= '/>';
+        return $recordButton->render();
+    }
 
-        return $btn;
+    private function getHoverText(array &$options, $label = '')
+    {
+        return $this->getLanguageService()->getLL(
+            $options[self::OPTION_HOVER_TEXT] ?? $label
+        ) ?: ($options[self::OPTION_HOVER_TEXT] ?? $label);
     }
 
     /**
-     * Creates a Link to show an item in frontend.
+     * Creates a new-record-button.
      *
-     * @param $pid
-     * @param $label
-     * @param string $urlParams
+     * @param string $table
+     * @param int    $pid
      * @param array  $options
      *
      * @return string
+     *
+     * @deprecated use createNewLink()
      */
-    public function createShowLink($pid, $label, $urlParams = '', $options = [])
+    public function createNewButton($table, $pid, $options = [])
     {
-        if ($options['sprite'] ?? false) {
-            $label = Icons::getSpriteIcon($options['sprite']);
-        }
-        $jsCode = BackendUtility::viewOnClick($pid, '', null, '', '', $urlParams);
-        $title = '';
-        if ($options['hover'] ?? false) {
-            $title = ' title="'.$options['hover'].'" ';
-        }
-
-        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
-        $class = ' class="'.$class.'"';
-
-        return '<a href="#" '.$class.' onclick="'.htmlspecialchars($jsCode).'" '.$title.'>'.$label.'</a>';
+        return $this->createNewLink($table, $pid, $options[self::OPTION_TITLE] ?? 'New', $options);
     }
 
     /**
-     * Erstellt einen Link zur Erstellung eines neuen Datensatzes
-     * Possible options:
-     * - params: some plain url params like "&myparam=4"
-     * - title: label for this link
-     * - confirm: some confirm message
-     * - defvals: an array for defVals like this: ['mytable' => ['myfield' => 'initialvalue', ]]
-     * - class: css class for a tag. default is "btn btn-default btn-sm".
+     * Erstellt einen Link zur Bearbeitung eines Datensatzes.
      *
-     * @param string $table   DB-Tabelle des Datensatzes
-     * @param int    $pid     UID der Zielseite
-     * @param string $label   Bezeichnung des Links
+     * @param string $editTable DB-Tabelle des Datensatzes
+     * @param int    $editUid   UID des Datensatzes
+     * @param string $label     Bezeichnung des Links
      * @param array  $options
      *
      * @return string
      */
-    public function createNewLink($table, $pid, $label = 'New', $options = [])
+    public function createEditLink($editTable, $editUid, $label = 'Edit', $options = [])
+    {
+        $uri = $this->buildEditUri($editTable, $editUid, 'edit', $options);
+
+        $image = Icons::getSpriteIcon('actions-document-open', ['asIcon' => true]);
+        $recordButton = $this->makeLinkButton($uri, $label)
+            ->setIcon($image);
+
+        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : '';
+        $recordButton->setClasses($class);
+        $recordButton->setHoverText($this->getHoverText($options) ?: $label);
+
+        return $recordButton->render();
+    }
+
+    /**
+     * @param string $operation new or edit
+     */
+    private function buildEditUri($table, $pid, $operation, array $options)
     {
-        $params = '&edit['.$table.']['.$pid.']=new';
+        $returnUrl = T3General::getIndpEnv('REQUEST_URI');
+        $uri = (string) $this->uriBuilder->buildUriFromRoute(
+            'record_edit',
+            [
+                'id' => $pid,
+                'returnUrl' => $returnUrl,
+                sprintf('edit[%s][%s]', $table, $pid) => $operation,
+            ]
+        );
         if (isset($options[self::OPTION_PARAMS])) {
-            $params .= $options[self::OPTION_PARAMS];
+            $uri .= $options[self::OPTION_PARAMS];
         }
-        $params .= $this->buildDefVals($options);
-        $title = isset($options[self::OPTION_TITLE]) ? $options[self::OPTION_TITLE] : $GLOBALS['LANG']->getLL('new', 1);
 
-        $jsCode = BackendUtility::editOnClick($params);
-        if (isset($options[self::OPTION_CONFIRM]) && strlen($options[self::OPTION_CONFIRM]) > 0) {
-            $jsCode = 'if(confirm('.Strings::quoteJSvalue($options[self::OPTION_CONFIRM]).')) {'.$jsCode.'} else {return false;}';
-        }
-        $image = Icons::getSpriteIcon('actions-document-new');
+        return $uri;
+    }
 
-        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
-        $class = ' class="'.$class.'"';
+    /**
+     * Erstellt einen History-Link
+     * Achtung: Benötigt die JS-Funktion jumpExt() in der Seite.
+     *
+     * @param string $table
+     * @param int    $recordUid
+     *
+     * @return string
+     */
+    public function createHistoryLink($table, $recordUid, $label = '')
+    {
+        $moduleUrl = BackendUtility::getModuleUrl('record_history', ['element' => $table.':'.$recordUid]);
+        $options = [
+            self::OPTION_ICON_NAME => 'actions-document-history-open',
+        ];
 
-        return '<a href="#" title="'.$title.'" '.$class.' onclick="'.htmlspecialchars($jsCode, -1).'">'.
-                $image.$label.'</a>';
+        $btn = $this->createModuleButton($moduleUrl, $label, $options);
+
+        return $btn->render();
     }
 
     /**
@@ -298,15 +340,13 @@ public function createHideLink($table, $uid, $unhide = false, $options = [])
         $sEnableColumn = ($sEnableColumn) ? $sEnableColumn : 'hidden';
         $label = isset($options['label']) ? $options['label'] : '';
 
-        $image = Icons::getSpriteIcon(
-            $unhide ? 'actions-edit-unhide' : 'actions-edit-hide'
-        );
+        $options[self::OPTION_ICON_NAME] = $unhide ? 'actions-edit-unhide' : 'actions-edit-hide';
 
         $options['hover'] = $unhide ? 'Show' : 'Hide UID: '.$uid;
 
         return $this->createLinkForDataHandlerAction(
             'data['.$table.']['.$uid.']['.$sEnableColumn.']='.($unhide ? 0 : 1),
-            $image.$label,
+            $label,
             $options
         );
     }
@@ -320,13 +360,23 @@ public function createHideLink($table, $uid, $unhide = false, $options = [])
      */
     public function createInfoLink($editTable, $editUid, $label = 'Info', $options = [])
     {
-        $image = Icons::getSpriteIcon('actions-document-info');
-        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
-        $class = ' class="'.$class.'"';
-        $label = isset($options['label']) ? $options['label'] : $label;
+        if (!TYPO3::isTYPO104OrHigher()) {
+            $image = Icons::getSpriteIcon('actions-document-info');
+            $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
+            $class = ' class="'.$class.'"';
+            $label = isset($options['label']) ? $options['label'] : $label;
 
-        return '<a '.$class.' href="#" onclick="top.launchView('."'".$editTable."', ' ".$editUid."'); return false;".'">'.
-            $image.$label.'</a>';
+            return '<a '.$class.' href="#" onclick="top.launchView('."'".$editTable."', ' ".$editUid."'); return false;".'">'.
+                $image.$label.'</a>';
+        }
+        $options[self::OPTION_ICON_NAME] = $options[self::OPTION_ICON_NAME] ?? 'actions-document-info';
+        $options[self::OPTION_DATA_ATTR] = [
+            'dispatch-action' => 'TYPO3.InfoWindow.showItem',
+            'dispatch-args-list' => sprintf('%s,%d', $editTable, $editUid),
+        ];
+        $btn = $this->createModuleButton('#', $label, $options);
+
+        return $btn->render();
     }
 
     /**
@@ -335,24 +385,26 @@ public function createInfoLink($editTable, $editUid, $label = 'Info', $options =
      * @param string $editTable  DB-Tabelle des Datensatzes
      * @param int    $recordUid  UID des Datensatzes
      * @param int    $currentPid PID der aktuellen Seite des Datensatzes
-     * @param string $label      Bezeichnung des Links
+     * @param string $label Bezeichnung des Links
      */
-    public function createMoveLink($editTable, $recordUid, $currentPid, $label = 'Move')
+    public function createMoveLink($editTable, $recordUid, $currentPid, $label = '')
     {
-        $this->initClipboard();
-        $this->addBaseInlineJSCode();
-        $isSel = (string) $this->clipObj->isSelected($editTable, $recordUid);
-        $image = Icons::getSpriteIcon('actions-edit-cut'.($isSel ? '-release' : ''));
+        $clipObj = $this->initClipboard();
+        $isSel = (string) $clipObj->isSelected($editTable, $recordUid);
+        $options = [];
+        $options[self::OPTION_ICON_NAME] = 'actions-edit-cut'.($isSel ? '-release' : '');
+        $tooltip = $isSel ? 'paste' : 'cut';
+        $options[self::OPTION_HOVER_TEXT] = $this->getLanguageService()->sl('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.'.$tooltip);
 
-        return '<a class="btn btn-default" href="#" onclick="'
-            .htmlspecialchars('return jumpSelf('.
-                Strings::quoteJSvalue(
-                    $this->clipObj->selUrlDB($editTable, $recordUid, 0, 'cut' === $isSel, ['returnUrl' => ''])
-                ).');')
-            .'" title="'.htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut')).'">'
-                .$image.'</a>';
+        $uri = $clipObj->selUrlDB($editTable, $recordUid, 0, 'cut' === $isSel, ['returnUrl' => '']);
+        $btn = $this->createModuleButton($uri, $label, $options);
+
+        return $btn->render();
     }
 
+    /**
+     * @return \TYPO3\CMS\Backend\Clipboard\Clipboard
+     */
     private function initClipboard()
     {
         if (!$this->clipObj) {
@@ -360,13 +412,15 @@ private function initClipboard()
             // Initialize - reads the clipboard content from the user session
             $this->clipObj->initializeClipboard();
 
-            $CB = T3GeneralAlias::_GET('CB');
+            $CB = T3General::_GET('CB');
             $this->clipObj->setCmd($CB ?? []);
             // Clean up pad
             $this->clipObj->cleanCurrent();
             // Save the clipboard content
             $this->clipObj->endClipboard();
         }
+
+        return $this->clipObj;
     }
 
     /**
@@ -376,22 +430,14 @@ private function initClipboard()
      * @param int    $uid
      * @param int    $moveId  die uid des elements vor welches das element aus $uid gesetzt werden soll
      * @param array  $options
-     *
-     * @TODO use $this->createLinkForDataHandlerAction
      */
     public function createMoveUpLink($table, $uid, $moveId, $options = [])
     {
-        $jsCode = $this->getJavaScriptForLinkToDataHandlerAction('cmd['.$table.']['.$uid.'][move]=-'.$moveId.'&prErr=1&uPT=1', $options);
-        $label = isset($options['label']) ? $options['label'] : 'Move up';
-        $title = isset($options['title']) ? $options['title'] : $label;
-
-        $image = Icons::getSpriteIcon('actions-move-up');
-
-        return sprintf(
-            '<a onclick="%1$s" href="#">%2$s%3$s</a>',
-            $jsCode,
-            $image,
-            $label
+        return $this->createMoveUpDownLink(
+            'cmd['.$table.']['.$uid.'][move]=-'.$moveId.'&prErr=1&uPT=1',
+            'actions-move-up',
+            'Move up',
+            $options
         );
     }
 
@@ -402,46 +448,27 @@ public function createMoveUpLink($table, $uid, $moveId, $options = [])
      * @param int    $uid
      * @param int    $moveId  die uid des elements nach welchem das element aus $uid gesetzt werden soll
      * @param array  $options
-     *
-     * @TODO use $this->createLinkForDataHandlerAction
      */
     public function createMoveDownLink($table, $uid, $moveId, $options = [])
     {
-        $jsCode = $this->getJavaScriptForLinkToDataHandlerAction('cmd['.$table.']['.$uid.'][move]=-'.$moveId, $options);
-        $label = isset($options['label']) ? $options['label'] : 'Move up';
-        $title = isset($options['title']) ? $options['title'] : $label;
-
-        $image = Icons::getSpriteIcon('actions-move-down');
-
-        return sprintf(
-            '<a onclick="%1$s" href="#">%2$s%3$s</a>',
-            $jsCode,
-            $image,
-            $label
+        return $this->createMoveUpDownLink(
+            'cmd['.$table.']['.$uid.'][move]=-'.$moveId,
+            'actions-move-down',
+            'Move down',
+            $options
         );
     }
 
-    /**
-     * Creates js code with command for TCE datahandler and redirect to current script.
-     * Simple example to delete a page record:
-     * $this->getJavaScriptForLinkToDataHandlerAction('cmd[pages][123][delete]=1').
-     *
-     * @param string $urlParameters command for datahandler
-     * @param array  $options
-     *
-     * @return string
-     */
-    protected function getJavaScriptForLinkToDataHandlerAction($urlParameters, array $options = [])
+    private function createMoveUpDownLink($cmd, $iconName, $defaultLabel, array $options)
     {
-        $redirect = TYPO3::isTYPO115OrHigher() ? null : -1;
-        $jumpToUrl = BackendUtility::getLinkToDataHandlerAction('&'.$urlParameters, $redirect);
+        $label = isset($options['label']) ? $options['label'] : $defaultLabel;
+        if (isset($options['title']) && !isset($options[self::OPTION_HOVER_TEXT])) {
+            $options[self::OPTION_HOVER_TEXT] = $options['title'];
+        }
 
-        // the jumpUrl method is no longer global available since TYPO3 8.7
-        // furthermore we need the JS variable T3_THIS_LOCATION because it is used
-        // as redirect in getLinkToDataHandlerAction when -1 is passed
-        $this->addBaseInlineJSCode();
+        $options[self::OPTION_ICON_NAME] = $iconName;
 
-        return $this->getConfirmCode('return jumpToUrl('.Strings::quoteJSvalue($jumpToUrl).');', $options);
+        return $this->createLinkForDataHandlerAction($cmd, $label, $options);
     }
 
     /**
@@ -486,12 +513,12 @@ protected function getLinkThisScript($encode = true, array $options = [])
      */
     public function createDeleteLink($table, $uid, $label = 'Remove', $options = [])
     {
-        $image = Icons::getSpriteIcon('actions-delete');
-        $options['hover'] = 'Delete UID: '.$uid;
+        $options[self::OPTION_HOVER_TEXT] = 'Delete UID: '.$uid;
+        $options[self::OPTION_ICON_NAME] = 'actions-delete';
 
         return $this->createLinkForDataHandlerAction(
             'cmd['.$table.']['.$uid.'][delete]=1',
-            $image.$label,
+            $label,
             $options
         );
     }
@@ -539,14 +566,20 @@ public function createHidden($name, $value)
         return '<input type="hidden" name="'.$name.'" value="'.htmlspecialchars($value).'" />';
     }
 
+    /**
+     * @param string $onclick deprecated wird zukünftig wegen CSP nicht mehr unterstützt
+     */
     public function createRadio($name, $value, $checked = false, $onclick = '')
     {
-        return '<input type="radio" name="'.$name.'" value="'.htmlspecialchars($value).'" '.($checked ? 'checked="checked"' : '').(strlen($onclick) ? ' onclick="'.$onclick.'"' : '').' />';
+        return '<input type="radio" class="rnbase-checkbox" name="'.$name.'" value="'.htmlspecialchars($value).'" '.($checked ? 'checked="checked"' : '').(strlen($onclick) ? ' onclick="'.$onclick.'"' : '').' />';
     }
 
+    /**
+     * @param string $onclick deprecated wird zukünftig wegen CSP nicht mehr unterstützt
+     */
     public function createCheckbox($name, $value, $checked = false, $onclick = '')
     {
-        return '<input type="checkbox" name="'.$name.'" value="'.htmlspecialchars($value).'" '.($checked ? 'checked="checked"' : '').(strlen($onclick) ? ' onclick="'.$onclick.'"' : '').' />';
+        return '<input type="checkbox" class="rnbase-checkbox" name="'.$name.'" value="'.htmlspecialchars($value).'" '.($checked ? 'checked="checked"' : '').(strlen($onclick) ? ' onclick="'.$onclick.'"' : '').' />';
     }
 
     /**
@@ -588,34 +621,60 @@ public function createLink($paramStr, $pid, $label, array $options = [])
      */
     public function createModuleLink(array $params, $pid, $label, array $options = [])
     {
-        $label = $this->buildIconTag($options, $label);
         if (!isset($_GET['id']) && !isset($params['id'])) {
             // ensure pid is set even on POST requests.
             $params['id'] = $pid;
         }
-        $location = $this->getLinkThisScript(false, ['params' => $params]);
+        $uri = $this->getLinkThisScript(false, ['params' => $params]);
+        $recordButton = $this->createModuleButton($uri, $label, $options);
 
-        $jsCode = "window.location.href='".$location."'; return false;";
+        return $recordButton->render();
+    }
 
-        $title = '';
-        if (!empty($options['hover'])) {
-            $title = 'title="'.$options['hover'].'"';
+    /**
+     * @param string $uri
+     * @param mixed $label
+     * @param array $options
+     * @return EnhancedLinkButton
+     */
+    private function createModuleButton(string $uri, $label, array $options = [])
+    {
+        $recordButton = $this->makeLinkButton($uri, $label);
+
+        if (isset($options[self::OPTION_HOVER_TEXT])) {
+            $recordButton->setHoverText($options[self::OPTION_HOVER_TEXT]);
         }
 
-        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
-        $class = 'class="'.$class.'"';
+        if ($icon = $this->buildIcon($options)) {
+            $recordButton->setIcon($icon);
+        }
 
-        return '<a href="#" '.$class.' onclick="'.htmlspecialchars($jsCode).'" '.$title.'>'.$label.'</a>';
+        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : '';
+        if (isset($options[self::OPTION_CONFIRM]) && strlen($options[self::OPTION_CONFIRM]) > 0) {
+            $class .= ' t3js-modal-trigger';
+            $recordButton->setDataAttributes(['content' => $options[self::OPTION_CONFIRM]]);
+            $recordButton->setOverrideCss(false);
+        }
+        $recordButton->setClasses($class);
+
+        if (isset($options[self::OPTION_DATA_ATTR])) {
+            $recordButton->addDataAttributes((array) $options[self::OPTION_DATA_ATTR]);
+        }
+
+        return $recordButton;
     }
 
-    protected function buildIconTag(array $options, $label = '')
+    /**
+     * @return \TYPO3\CMS\Core\Imaging\Icon|null
+     */
+    protected function buildIcon(array $options)
     {
-        $tag = $label;
+        $tag = null;
         // $options['sprite'] für abwärtskompatibilität
         if (isset($options['icon']) || isset($options['sprite'])) {
             $icon = isset($options['icon']) ? $options['icon'] : $options['sprite'];
             // FIXME: label get lost here??
-            $tag = Icons::getSpriteIcon($icon, $options);
+            $tag = Icons::getSpriteIcon($icon, array_merge(['asIcon' => true], $options));
         }
 
         return $tag;
@@ -633,24 +692,35 @@ protected function buildIconTag(array $options, $label = '')
      */
     public function createSubmit($name, $value, $confirmMsg = '', $options = [])
     {
-        $icon = $this->buildIconTag($options, '');
-        $onClick = '';
-        if (strlen($confirmMsg)) {
-            $onClick = 'onclick="return confirm('.Strings::quoteJSvalue($confirmMsg).')"';
-        }
+        $value = htmlspecialchars($value);
+        $icon = $this->buildIcon($options);
+        $icon = $icon ? $icon->render() : '';
 
         $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
-        $class = ' class="'.$class.'"';
+        $class .= ' rnbase-btn';
 
-        if ($icon) {
-            $btn = '<button type="submit" '.$class.' name="'.$name.'" value="'.htmlspecialchars($value).'">'.
-                $icon.'</button>';
-        } else {
-            $btn = '<input type="submit" '.$class.' name="'.$name.'" value="'.htmlspecialchars($value).'" ';
-            $btn .= $onClick;
-            $btn .= '/>';
+        $attributes = [
+            'name' => $name,
+            'value' => $value,
+            'title' => $options[self::OPTION_HOVER_TEXT] ?? $name,
+        ];
+        if (!TYPO3::isTYPO121OrHigher()) {
+            $attributes['data-href'] = sprintf('javascript:%s', 'document.forms[\'editform\'].submit()');
+        }
+
+        if (strlen($confirmMsg)) {
+            $class .= ' t3js-modal-trigger';
+            $attributes['data-content'] = $confirmMsg;
+            // Der Name des Submit-Buttons liegt nicht mehr im POST. Deshalb ist zusätzliches JS notwendig.
+            $this->insertJsToolbox();
         }
 
+        $attributes['class'] = $class;
+
+        $attributesString = T3General::implodeAttributes($attributes, true);
+
+        $btn = '<button type="submit" '.$attributesString.'>'.$icon.$value.'</button>';
+
         return $btn;
     }
 
@@ -699,17 +769,17 @@ public function createIntInput($name, $value, $width, $maxlength = 10)
 
     /**
      * Erstellt ein Eingabefeld für DateTime.
-     *
-     * @todo fix prefilling of field in TYPO3 8.7
      */
-    public function createDateInput($name, $value)
+    public function createDateInput($name, $value, array $options = [])
     {
         // Take care of current time zone. Thanks to Thomas Maroschik!
         if (Math::isInteger($value) && !TYPO3::isTYPO121OrHigher()) {
             $value += date('Z', $value);
         }
         $this->initializeJavaScriptFormEngine();
-        $dateElementClass = \TYPO3\CMS\Backend\Form\Element\InputDateTimeElement::class;
+        $dateElementClass = TYPO3::isTYPO121OrHigher() ?
+            \TYPO3\CMS\Backend\Form\Element\DatetimeElement::class :
+            \TYPO3\CMS\Backend\Form\Element\InputDateTimeElement::class;
 
         // [itemFormElName] => data[tx_cfcleague_games][4][status]
         // [itemFormElID] => data_tx_cfcleague_games_4_status
@@ -752,6 +822,16 @@ public function createDateInput($name, $value)
                     $pageRenderer->loadRequireJsModule($moduleName, $callback);
                 }
             }
+        } elseif ($renderedElement['javaScriptModules'] ?? null) {
+            $pageRenderer = $this->getDoc()->getPageRenderer();
+            foreach ($renderedElement['javaScriptModules'] as $moduleName) {
+                /* @var \TYPO3\CMS\Core\Page\JavaScriptModuleInstruction $moduleName */
+                $this->insertJsModule($moduleName->getName());
+            }
+        }
+
+        if (isset($options[self::OPTION_HIDE_LABEL])) {
+            $renderedElement['html'] = preg_replace('/<code.*<\/code>/', '', $renderedElement['html']);
         }
 
         return $renderedElement['html'];
@@ -767,17 +847,17 @@ protected function initializeJavaScriptFormEngine()
         $usDateFormat = 0;
         if (!TYPO3::isTYPO121OrHigher()) {
             $usDateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['USdateFormat'] ? '1' : '0';
-        }
-        $initializeFormEngineCallback = 'function(FormEngine) {
-            FormEngine.initialize(
-                '.$moduleUrl.','.$usDateFormat.'
+            $initializeFormEngineCallback = 'function(FormEngine) {
+                FormEngine.initialize(
+                    '.$moduleUrl.','.$usDateFormat.'
+                );
+            }';
+
+            $this->getDoc()->getPageRenderer()->loadRequireJsModule(
+                'TYPO3/CMS/Backend/FormEngine',
+                $initializeFormEngineCallback
             );
-        }';
-
-        $this->getDoc()->getPageRenderer()->loadRequireJsModule(
-            'TYPO3/CMS/Backend/FormEngine',
-            $initializeFormEngineCallback
-        );
+        }
         $this->getDoc()->getPageRenderer()->addInlineSetting('FormEngine', 'formName', 'editform');
     }
 
@@ -824,6 +904,11 @@ public function createSelectSingleByArray($name, $value, $arr, $options = 0)
         return $this->createSelectByArray($name, $value, $arr, $options);
     }
 
+    private function insertJsToolbox()
+    {
+        $this->insertJsModule('@sys25/rn_base/toolbox.js');
+    }
+
     /**
      * Erstellt eine Select-Box aus dem übergebenen Array.
      * in den Options kann mit dem key reload angegeben werden,
@@ -844,20 +929,44 @@ public function createSelectByArray($name, $currentValues, array $selectOptions,
     {
         $options = is_array($options) ? $options : [];
 
-        $onChangeStr = !empty($options['reload']) ? ' this.form.submit(); ' : '';
-        if (!empty($options['onchange'])) {
+        $attrArr = [];
+        $onChangeStr = '';
+        if (!empty($options['reload'])) {
+            if (TYPO3::isTYPO104OrHigher()) {
+                $attrArr[] = 'data-global-event="change" data-action-submit="$form"';
+            } else {
+                $onChangeStr = ' this.form.submit(); ';
+            }
+            $this->insertJsToolbox();
+        }
+
+        if (isset($options['onchange'])) {
             $onChangeStr .= $options['onchange'];
         }
         if ($onChangeStr) {
-            $onChangeStr = ' onchange="'.$onChangeStr.'" ';
+            $onChangeStr = 'onchange="'.$onChangeStr.'"';
+            $attrArr[] = $onChangeStr;
         }
 
-        $multiple = !empty($options['multiple']) ? ' multiple="multiple"' : '';
+        $multiple = !empty($options['multiple']) ? 'multiple="multiple"' : '';
+        if ($multiple) {
+            $attrArr[] = $multiple;
+        }
         $name .= !empty($options['multiple']) ? '[]' : '';
 
-        $size = !empty($options['size']) ? ' size="'.$options['size'].'"' : '';
+        $size = !empty($options['size']) ? 'size="'.$options['size'].'"' : '';
+        if ($size) {
+            $attrArr[] = $size;
+        }
+        $classes = $options[self::OPTION_CSS_CLASSES] ?? '';
+
+        $attr = implode(' ', $attrArr);
 
-        $out = '<select name="'.$name.'" class="select"'.$onChangeStr.$multiple.$size.'>';
+        $out = sprintf('<select name="%s" class="%s"%s>',
+            $name,
+            trim('select '.$classes),
+            $attr ? ' '.$attr : ''
+        );
 
         $currentValues = Strings::trimExplode(',', $currentValues);
 
@@ -952,6 +1061,8 @@ public function getJSCode($pid, $location = '')
      * and global Vars T3_RETURN_URL and T3_THIS_LOCATION to PageRenderer.
      *
      * @param string $location
+     *
+     * @deprecated should not be used anymore
      */
     public function addBaseInlineJSCode($location = '')
     {
@@ -971,8 +1082,10 @@ public function addBaseInlineJSCode($location = '')
      * @param string $location module url or empty
      *
      * @return string
+     *
+     * @deprecated should not be used anymore
      */
-    protected function getBaseJavaScriptCode($location = '')
+    private function getBaseJavaScriptCode($location = '')
     {
         $location = $location ? $location : $this->getLinkThisScript(false);
 
@@ -1030,7 +1143,7 @@ public function showTabMenu($pid, $name, $modName, $entries)
         ];
         $SETTINGS = BackendUtility::getModuleData(
             $MENU,
-            T3GeneralAlias::_GP('SET'),
+            T3General::_GP('SET'),
             $modName
         );
         $menuItems = [];
@@ -1042,13 +1155,7 @@ public function showTabMenu($pid, $name, $modName, $entries)
             $menuItems[] = [
                 'isActive' => $SETTINGS[$name] == $key,
                 'label' => $value,
-                // jumpUrl ist ab TYPO3 6.2 nicht mehr nötig
-                // @TODO jumpUrl entfernen wenn kein Support mehr für 4.5
-                // Also jumpUrl wird auch in der 12 zumindest noch verwendet...
-                'url' => '#',
-                'addParams' => 'onclick="jumpToUrl(\''.
-                                $this->buildScriptURI(['id' => $pid, 'SET['.$name.']' => $key]).
-                                '\',this);"',
+                'url' => $this->buildScriptURI(['id' => $pid, 'SET['.$name.']' => $key]),
             ];
         }
 
@@ -1105,8 +1212,7 @@ public static function showMenu($pid, $name, $modName, $entries, $script = '', $
         if (is_array($MENU[$name]) && 1 == count($MENU[$name])) {
             $ret['menu'] = self::buildDummyMenu('SET['.$name.']', $MENU[$name]);
         } else {
-            $funcMenu = 'getDropdownMenu';
-            $ret['menu'] = BackendUtility::$funcMenu(
+            $ret['menu'] = BackendUtility::getDropdownMenu(
                 $pid,
                 'SET['.$name.']',
                 $SETTINGS[$name],
@@ -1183,6 +1289,8 @@ public function getTCEFormArray($table, $theUid, $isNew = false)
     }
 
     /**
+     * $this->createLinkForDataHandlerAction('cmd[pages][123][delete]=1').
+     *
      * @param string $actionParameters
      * @param string $label
      * @param array  $options
@@ -1191,22 +1299,55 @@ public function getTCEFormArray($table, $theUid, $isNew = false)
      */
     public function createLinkForDataHandlerAction($actionParameters, $label, array $options = [])
     {
-        // $options['sprite'] für abwärtskompatibilität
-        if (isset($options['icon']) || isset($options['sprite'])) {
-            $icon = isset($options['icon']) ? $options['icon'] : $options['sprite'];
-            $label = Icons::getSpriteIcon($icon, $options);
+        if (isset($options['sprite'])) {
+            $options[self::OPTION_ICON_NAME] = $options['sprite'];
         }
+        $uri = $this->buildDataHandlerUri($actionParameters, '');
 
-        $jsCode = $this->getJavaScriptForLinkToDataHandlerAction($actionParameters, $options);
-        $title = '';
-        if (!empty($options['hover'])) {
-            $title = 'title="'.$options['hover'].'"';
+        $btn = $this->createModuleButton($uri, $label, $options);
+
+        return $btn->render();
+    }
+
+    /**
+     * Bietet eine Möglichkeit JS-Module sowohl per AMD als auch ES6 (ab TYPO3 12) zu laden.
+     *
+     * ES6-Modul:  @vendor/ext_key/some-es6-module.js
+     * wird konvertiert in
+     * AMD-Module: 'TYPO3/CMS/ExtKey/SomeEs6Module'
+     *
+     * Es die entsprechenden Dateien müssen natürlich in der jeweiligen Extension bereitgestellt werden.
+     *
+     * @param string $es6Module Name des ES6-Moduls
+     * @param string $callBackFunction optionaler Startup-Code for AMD-Variante. Ab T3 12 nicht mehr verwendet.
+     */
+    public function insertJsModule(string $es6Module, $callBackFunction = null)
+    {
+        $pageRenderer = $this->doc->getPageRenderer();
+        if (TYPO3::isTYPO121OrHigher()) {
+            $pageRenderer->loadJavaScriptModule($es6Module);
+        } else {
+            list($vendor, $extKey, $jsModule) = explode('/', $es6Module, 3);
+            $extKey = Strings::underscoredToUpperCamelCase($extKey);
+            $jsModule = Strings::dashedToUpperCamelCase($jsModule);
+
+            $pageRenderer->loadRequireJsModule(
+                sprintf('TYPO3/CMS/%s/%s', $extKey, substr($jsModule, 0, -3)),
+                $callBackFunction
+            );
         }
+    }
 
-        $class = array_key_exists('class', $options) ? htmlspecialchars($options['class']) : self::CSS_CLASS_BTN;
-        $class = 'class="'.$class.'"';
+    protected function buildDataHandlerUri(string $params, $redirect)
+    {
+        return BackendUtility::getLinkToDataHandlerAction('&'.$params, $redirect);
+    }
 
-        return '<a href="#" '.$class.' onclick="'.htmlspecialchars($jsCode).'" '.
-                $title.'>'.$label.'</a>';
+    /**
+     * @return \TYPO3\CMS\Core\Localization\LanguageService|\TYPO3\CMS\Lang\LanguageService
+     */
+    public function getLanguageService()
+    {
+        return $this->lang;
     }
 }
diff --git a/Classes/Backend/Module/BaseModule.php b/Classes/Backend/Module/BaseModule.php
index faa1df96..aeea86b5 100644
--- a/Classes/Backend/Module/BaseModule.php
+++ b/Classes/Backend/Module/BaseModule.php
@@ -503,16 +503,8 @@ protected function initDoc($doc)
         $doc->inDocStylesArray[] = $doc->inDocStyles;
         $doc->tableLayout = $this->getTableLayout();
         $doc->setModuleTemplate($this->getModuleTemplate());
+        // Ernsthaft??
         $doc->loadJavascriptLib('contrib/prototype/prototype.js');
-        // JavaScript
-        $doc->JScode .= '
-            <script>
-                script_ended = 0;
-                function jumpToUrl(URL)	{
-                    document.location = URL;
-                }
-            </script>
-            ';
 
         if (!TYPO3::isTYPO115OrHigher()) {
             // TODO: Die Zeile könnte problematisch sein...
diff --git a/Classes/Backend/Template/ModuleTemplate.php b/Classes/Backend/Template/ModuleTemplate.php
index 384dc4e5..c6e30787 100644
--- a/Classes/Backend/Template/ModuleTemplate.php
+++ b/Classes/Backend/Template/ModuleTemplate.php
@@ -247,24 +247,6 @@ protected function initDoc($doc)
         $doc->inDocStylesArray[] = $doc->inDocStyles;
         //        $doc->tableLayout = $this->getTableLayout();
         $doc->setModuleTemplate($this->options['template']);
-        //            $doc->getPageRenderer()->loadJquery();
-        // JavaScript
-        $doc->JScode .= '
-            <script>
-                script_ended = 0;
-                function jumpToUrl(URL)	{
-                    document.location = URL;
-                }
-            </script>
-            ';
-
-        if (!TYPO3::isTYPO115OrHigher()) {
-            // TODO: Die Zeile könnte problematisch sein...
-            $doc->postCode = '
-                <script>
-                    script_ended = 1;
-                    if (top.fsMod) top.fsMod.recentIds["web"] = '.$this->options['pid'].';</script>';
-        }
     }
 
     private function prepareOptions($options)
diff --git a/Classes/Backend/Template/Override/DocumentTemplate.php b/Classes/Backend/Template/Override/DocumentTemplate.php
index e7829b71..9a365c7b 100644
--- a/Classes/Backend/Template/Override/DocumentTemplate.php
+++ b/Classes/Backend/Template/Override/DocumentTemplate.php
@@ -2,9 +2,11 @@
 
 namespace Sys25\RnBase\Backend\Template\Override;
 
+use Sys25\RnBase\Backend\Utility\Icons;
 use Sys25\RnBase\Utility\Files;
 use Sys25\RnBase\Utility\Strings;
 use Sys25\RnBase\Utility\T3General;
+use Sys25\RnBase\Utility\TYPO3;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -34,18 +36,17 @@
 
 class DocumentTemplate
 {
+    public const STATE_NOTICE = -2;
+    public const STATE_INFO = -1;
     public const STATE_OK = -1;
-
-    public const STATE_NOTICE = 1;
-
-    public const STATE_WARNING = 2;
-
-    public const STATE_ERROR = 3;
-
     public const STATE_DEFAULT = 0;
+    public const STATE_SUCCESS = 0;
+    public const STATE_WARNING = 1;
+    public const STATE_ERROR = 2;
 
     public $divClass = false;
 
+    /** @deprecated use external js files */
     public $JScode = '';
     public $endOfPageJsBlock = '';
     /**
@@ -54,10 +55,10 @@ class DocumentTemplate
      * @var array
      */
     public $JScodeArray = ['jumpToUrl' => '
-function jumpToUrl(URL) {
-	window.location.href = URL;
-	return false;
-}
+        function jumpToUrl(URL) {
+            window.location.href = URL;
+            return false;
+        }
 	'];
 
     /**
@@ -91,6 +92,12 @@ function jumpToUrl(URL) {
     protected $moduleTemplateFilename;
     public $form;
 
+    /** @var \TYPO3\CMS\Core\Messaging\FlashMessageService */
+    protected $flashMessageService;
+
+    /** @var LanguageService */
+    private $lang;
+
     /**
      * Constructor.
      */
@@ -98,6 +105,9 @@ public function __construct()
     {
         // Initializes the page rendering object:
         $this->initPageRenderer();
+
+        $this->flashMessageService = T3General::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
+        $this->lang = $GLOBALS['LANG'];
     }
 
     /**
@@ -236,7 +246,7 @@ public function section($label, $text, $nostrtoupper = false, $sH = false, $type
                 '<div class="media-left">'.
                   '<span class="fa-stack fa-lg callout-icon">'.
                     '<i class="fa fa-circle fa-stack-2x"></i>'.
-                    '<i class="fa fa-'.htmlspecialchars($icon).' fa-stack-1x"></i>'.
+                    '<i class="fa fa-'.$icon.' fa-stack-1x"></i>'.
                   '</span>'.
                 '</div>';
         }
@@ -283,8 +293,12 @@ public function divider($dist)
     public function insertStylesAndJS($content)
     {
         // Insert accumulated JS
-        $jscode = $this->JScode.LF.GeneralUtility::wrapJS(implode(LF, $this->JScodeArray));
-        $content = str_replace('<!--###POSTJSMARKER###-->', $jscode, $content);
+        $jscode = '';
+        // TODO: check lowest version
+        if (!TYPO3::isTYPO121OrHigher()) {
+            $jscode = $this->JScode.LF.GeneralUtility::wrapJS(implode(LF, $this->JScodeArray));
+            $content = str_replace('<!--###POSTJSMARKER###-->', $jscode, $content);
+        }
 
         return $content;
     }
@@ -390,8 +404,8 @@ public function wrapScriptTags($string, $linebreak = true)
             // Remove nl from the beginning
             $string = ltrim($string, LF);
             // Re-ident to one tab using the first line as reference
-            if (TAB === $string[0]) {
-                $string = TAB.ltrim($string, TAB);
+            if ("\t" === $string[0]) {
+                $string = "\t".ltrim($string, "\t");
             }
             $string = $cr.'<script>
 /*<![CDATA[*/
@@ -411,7 +425,7 @@ protected function initPageRenderer()
         if (null !== $this->pageRenderer) {
             return;
         }
-        $this->pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+        $this->pageRenderer = T3General::makeInstance(PageRenderer::class);
         $this->pageRenderer->setLanguage($GLOBALS['LANG']->lang);
         $this->pageRenderer->enableConcatenateCss();
         $this->pageRenderer->enableConcatenateJavascript();
@@ -432,8 +446,51 @@ protected function initPageRenderer()
         foreach ($this->jsFiles as $file) {
             $this->pageRenderer->addJsFile($file);
         }
-        if (1 === (int) $GLOBALS['TYPO3_CONF_VARS']['BE']['debug']) {
+        if (!TYPO3::isTYPO130OrHigher() && 1 === (int) $GLOBALS['TYPO3_CONF_VARS']['BE']['debug']) {
             $this->pageRenderer->enableDebugMode();
         }
     }
+
+    public function showFlashMessage($message, $severity = self::STATE_NOTICE, $header = 'Notice')
+    {
+        $lang = $this->getLangSrv();
+        $message = $lang->getLL($message) ?: $message;
+        $header = $lang->getLL($header) ?: $header;
+        $severityMap = [];
+        if (TYPO3::isTYPO121OrHigher()) {
+            $severityMap = [
+                self::STATE_NOTICE => \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::NOTICE,
+                self::STATE_INFO => \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::INFO,
+                self::STATE_DEFAULT => \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::OK,
+                self::STATE_WARNING => \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::WARNING,
+                self::STATE_ERROR => \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::ERROR,
+            ];
+        } else {
+            $severityMap = [
+                self::STATE_NOTICE => \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE,
+                self::STATE_INFO => \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+                self::STATE_DEFAULT => \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                self::STATE_WARNING => \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+                self::STATE_ERROR => \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+            ];
+        }
+
+        $message = T3General::makeInstance(
+            \TYPO3\CMS\Core\Messaging\FlashMessage::class,
+            $message,
+            $header,
+            $severityMap[$severity] ?? null,
+            false
+        );
+        $messageQueue = $this->flashMessageService->getMessageQueueByIdentifier();
+        $messageQueue->addMessage($message);
+    }
+
+    /**
+     * @return \TYPO3\CMS\Core\Localization\LanguageService|\TYPO3\CMS\Lang\LanguageService
+     */
+    public function getLangSrv()
+    {
+        return $this->lang;
+    }
 }
diff --git a/Classes/Backend/Utility/BackendUtility.php b/Classes/Backend/Utility/BackendUtility.php
index f2e28801..6705836a 100644
--- a/Classes/Backend/Utility/BackendUtility.php
+++ b/Classes/Backend/Utility/BackendUtility.php
@@ -3,9 +3,10 @@
 namespace Sys25\RnBase\Backend\Utility;
 
 use InvalidArgumentException;
+use Sys25\RnBase\Utility\T3General;
 use Sys25\RnBase\Utility\TYPO3;
 use tx_rnbase;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
 
 /***************************************************************
  * Copyright notice
@@ -146,7 +147,28 @@ public static function workspaceOL($table, &$row, $wsid = -99, $unsetMovePointer
      */
     public static function issueCommand($getParameters, $redirectUrl = '')
     {
-        $link = \TYPO3\CMS\Backend\Utility\BackendUtility::getLinkToDataHandlerAction($getParameters, $redirectUrl);
+        $link = self::getLinkToDataHandlerAction($getParameters, $redirectUrl);
+
+        return $link;
+    }
+
+    /**
+     * Returns a URL with a command to TYPO3 Datahandler.
+     *
+     * @param string $parameters Set of GET params to send. Example: "&cmd[tt_content][123][move]=456" or "&data[tt_content][123][hidden]=1&data[tt_content][123][title]=Hello%20World
+     * @param string $redirectUrl Redirect URL, default is to use $GLOBALS['TYPO3_REQUEST']->getAttribute('normalizedParams')->getRequestUri()
+     * @return string
+     */
+    public static function getLinkToDataHandlerAction($parameters, $redirectUrl = '')
+    {
+        if (TYPO3::isTYPO121OrHigher()) {
+            $uriBuilder = T3General::makeInstance(UriBuilder::class);
+            $url = (string) $uriBuilder->buildUriFromRoute('tce_db').$parameters.'&redirect=';
+            $url .= rawurlencode($redirectUrl ?: $GLOBALS['TYPO3_REQUEST']->getAttribute('normalizedParams')->getRequestUri());
+
+            return $url;
+        }
+        $link = \TYPO3\CMS\Backend\Utility\BackendUtility::getLinkToDataHandlerAction($parameters, $redirectUrl);
 
         return $link;
     }
@@ -185,15 +207,18 @@ public static function getModuleUrl($moduleName, $urlParameters = [])
      * @param string $params parameters sent along to EditDocumentController
      *
      * @return string
+     *
+     * @deprecated
      */
     public static function editOnClick($params)
     {
-        $returnUrl = GeneralUtility::quoteJSvalue(
-            rawurlencode(GeneralUtility::getIndpEnv('REQUEST_URI'))
+        $returnUrl = T3General::quoteJSvalue(
+            rawurlencode(T3General::getIndpEnv('REQUEST_URI'))
         );
         /* @var $uriBuilder \TYPO3\CMS\Backend\Routing\UriBuilder */
-        $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+        $uriBuilder = T3General::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+        $uri = $uriBuilder->buildUriFromRoute('record_edit').$params;
 
-        return 'window.location.href='.GeneralUtility::quoteJSvalue((string) $uriBuilder->buildUriFromRoute('record_edit').$params.'&returnUrl=').'+'.$returnUrl.'; return false;';
+        return 'window.location.href='.T3General::quoteJSvalue((string) $uri.'&returnUrl=').'+'.$returnUrl.'; return false;';
     }
 }
diff --git a/Classes/Backend/Utility/IconMap.php b/Classes/Backend/Utility/IconMap.php
new file mode 100644
index 00000000..f557380a
--- /dev/null
+++ b/Classes/Backend/Utility/IconMap.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace Sys25\RnBase\Backend\Utility;
+
+use Sys25\RnBase\Utility\TYPO3;
+
+/**
+ * Mapping for pre 10.x icons.
+ */
+class IconMap
+{
+    private static $aliasMap = [
+        'actions-view-go-back' => 'actions-arrow-down-left',
+        'actions-view-go-forward' => 'actions-arrow-down-right',
+        'actions-version-workspace-sendtoprevstage' => 'actions-arrow-left',
+        'actions-view-go-down' => 'actions-arrow-right-down',
+        'actions-view-go-up' => 'actions-arrow-right-up',
+        'actions-version-workspace-sendtostage' => 'actions-arrow-right',
+        'actions-system-cache-clear' => 'actions-bolt',
+        'actions-system-cache-clear-impact-high' => 'actions-bolt',
+        'actions-system-cache-clear-impact-medium' => 'actions-bolt',
+        'actions-system-cache-clear-impact-low' => 'actions-bolt',
+        'actions-system-cache-clear-rte' => 'actions-bolt',
+        'information-os-apple' => 'actions-brand-apple',
+        'information-git' => 'actions-brand-git',
+        'information-os-linux' => 'actions-brand-linux',
+        'information-php-version' => 'actions-brand-php',
+        'actions-slack' => 'actions-brand-slack',
+        'actions-typo3' => 'actions-brand-typo3',
+        'information-os-windows' => 'actions-brand-windows',
+        'actions-brand-twitter' => 'actions-brand-x',
+        'actions-edit-pick-date' => 'actions-calendar-alternative',
+        'actions-move-to-bottom' => 'actions-caret-bar-bottom',
+        'actions-move-to-top' => 'actions-caret-bar-top',
+        'actions-move-down' => 'actions-caret-down',
+        'actions-pagetree-expand' => 'actions-caret-down',
+        'status-status-sorting-desc' => 'actions-caret-down',
+        'status-status-sorting-light-desc' => 'actions-caret-down',
+        'apps-irre-expanded' => 'actions-caret-down',
+        'apps-pagetree-expand' => 'actions-caret-down',
+        'actions-move-left' => 'actions-caret-left',
+        'actions-move-right' => 'actions-caret-right',
+        'actions-pagetree-collapse' => 'actions-caret-right',
+        'status-status-current' => 'actions-caret-right',
+        'apps-irre-collapsed' => 'actions-caret-right',
+        'apps-pagetree-collapse' => 'actions-caret-right',
+        'actions-move-up' => 'actions-caret-up',
+        'status-status-sorting-asc' => 'actions-caret-up',
+        'status-status-sorting-light-asc' => 'actions-caret-up',
+        'status-dialog-ok' => 'actions-check-circle',
+        'actions-check-unmarkstate' => 'actions-check-square',
+        'apps-pagetree-category-toggle-hide-checked' => 'actions-check-square',
+        'sysnote-type-4' => 'actions-check-square',
+        'status-status-checked' => 'actions-check',
+        'status-status-permission-granted' => 'actions-check',
+        'actions-view-paging-first' => 'actions-chevron-bar-left',
+        'actions-view-paging-first-disabled' => 'actions-chevron-bar-left',
+        'actions-view-paging-last' => 'actions-chevron-bar-right',
+        'actions-view-paging-last-disabled' => 'actions-chevron-bar-right',
+        'actions-view-paging-previous' => 'actions-chevron-double-left',
+        'actions-view-paging-previous-disabled' => 'actions-chevron-double-left',
+        'actions-view-paging-next' => 'actions-chevron-double-right',
+        'actions-view-paging-next-disabled' => 'actions-chevron-double-right',
+        'actions-view-list-expand' => 'actions-chevron-down',
+        'actions-view-table-collapse' => 'actions-chevron-left',
+        'actions-view-table-expand' => 'actions-chevron-right',
+        'actions-view-list-collapse' => 'actions-chevron-up',
+        'actions-edit-copy-release' => 'actions-clipboard-close',
+        'actions-document-paste-into' => 'actions-clipboard-paste',
+        'actions-document-paste' => 'actions-clipboard-paste',
+        'actions-edit-copy' => 'actions-clipboard',
+        'actions-message-error-close' => 'actions-close',
+        'actions-message-information-close' => 'actions-close',
+        'actions-message-notice-close' => 'actions-close',
+        'actions-message-ok-close' => 'actions-close',
+        'actions-message-warning-close' => 'actions-close',
+        'actions-input-clear' => 'actions-close',
+        'status-status-permission-denied' => 'actions-close',
+        'actions-online-media-add' => 'actions-cloud',
+        'actions-edit-merge-localization' => 'actions-code-merge-localization',
+        'actions-merge' => 'actions-code-merge',
+        'actions-version-document-remove' => 'actions-code-pull-request-close',
+        'sysnote-type-2' => 'actions-code',
+        'actions-system-extension-configure' => 'actions-cog-alt',
+        'sysnote-type-1' => 'actions-cog',
+        'actions-edit-cut-release' => 'actions-cut-release',
+        'actions-edit-cut' => 'actions-cut',
+        'actions-system-extension-sqldump' => 'actions-database-export',
+        'information-database' => 'actions-database',
+        'information-debugger' => 'actions-debug',
+        'actions-edit-undelete-edit' => 'actions-delete-edit',
+        'actions-edit-restore' => 'actions-delete-restore',
+        'actions-edit-delete' => 'actions-delete',
+        'actions-selection-delete' => 'actions-delete',
+        'actions-dice-one' => 'actions-dice-1',
+        'actions-dice-two' => 'actions-dice-2',
+        'actions-dice-three' => 'actions-dice-3',
+        'actions-dice-four' => 'actions-dice-4',
+        'actions-dice-five' => 'actions-dice-5',
+        'actions-dice-six' => 'actions-dice-6',
+        'actions-document-new' => 'actions-document-add',
+        'actions-document-open' => 'actions-document-edit',
+        'actions-document-open-read-only' => 'actions-document-readonly',
+        'actions-insert-reference' => 'actions-document-share',
+        'actions-system-extension-download' => 'actions-download',
+        'actions-edit-download' => 'actions-download',
+        'actions-move-move' => 'actions-drag',
+        'actions-document-duplicates-select' => 'actions-duplicates',
+        'status-dialog-information' => 'actions-exclamation-circle',
+        'status-dialog-notification' => 'actions-exclamation-circle',
+        'status-dialog-warning' => 'actions-exclamation-triangle',
+        'status-dialog-error' => 'actions-exclamation-triangle',
+        'actions-system-extension-install' => 'actions-extension-add',
+        'actions-system-extension-import' => 'actions-extension-import',
+        'actions-system-extension-update' => 'actions-extension-refresh',
+        'actions-system-extension-update-disable' => 'actions-extension-refresh',
+        'actions-system-extension-uninstall' => 'actions-extension-remove',
+        'actions-version-workspaces-preview-link' => 'actions-eye-link',
+        'actions-version-workspace-preview' => 'actions-eye',
+        'actions-view' => 'actions-eye',
+        'actions-page-new' => 'actions-file-add',
+        'actions-document-export-csv' => 'actions-file-csv-download',
+        'actions-version-page-open' => 'actions-file-edit',
+        'actions-page-open' => 'actions-file-edit',
+        'actions-page-move' => 'actions-file-move',
+        'actions-system-pagemodule-open' => 'actions-file-search',
+        'actions-document-export-t3d' => 'actions-file-t3d-download',
+        'actions-document-import-t3d' => 'actions-file-t3d-upload',
+        'actions-view-page' => 'actions-file-view',
+        'actions-system-tree-search-open' => 'actions-filter',
+        'actions-insert-record' => 'actions-folder',
+        'actions-document-history-open' => 'actions-history',
+        'actions-document-info' => 'actions-info',
+        'actions-edit-insert-default' => 'actions-insert',
+        'actions-wizard-rte' => 'actions-link',
+        'actions-wizard-link' => 'actions-link',
+        'actions-system-list-open' => 'actions-list-alternative',
+        'actions-sign-in' => 'actions-login',
+        'actions-sign-out' => 'actions-logout',
+        'actions-edit-localize-status-high' => 'actions-message-add',
+        'actions-localize' => 'actions-message-localize',
+        'actions-edit-localize-status-low' => 'actions-message-remove',
+        'actions-remove' => 'actions-minus',
+        'information-composer-mode' => 'actions-music',
+        'sysnote-type-0' => 'actions-note',
+        'actions-system-typoscript-documentation' => 'actions-notebook-typoscript',
+        'actions-system-typoscript-documentation-open' => 'actions-notebook-typoscript',
+        'actions-system-extension-documentation' => 'actions-notebook',
+        'actions-pencil' => 'actions-open',
+        'actions-system-options-view' => 'actions-options',
+        'actions-pagetree-mountroot' => 'actions-pagetree-mount',
+        'actions-document-paste-after' => 'actions-paste-after',
+        'actions-add-placeholder' => 'actions-placeholder-add',
+        'actions-add' => 'actions-plus',
+        'actions-system-help-open' => 'actions-question',
+        'actions-edit-redo' => 'actions-redo',
+        'actions-system-refresh' => 'actions-refresh',
+        'actions-edit-rename' => 'actions-rename',
+        'actions-edit-replace' => 'actions-replace',
+        'actions-document-save-new' => 'actions-save-add',
+        'actions-document-save-close' => 'actions-save-close',
+        'actions-document-save-cleartranslationcache' => 'actions-save-translation-clearcache',
+        'actions-document-save-translation' => 'actions-save-translation',
+        'actions-document-save-view' => 'actions-save-view',
+        'actions-document-save' => 'actions-save',
+        'information-webserver' => 'actions-server',
+        'share-alt' => 'actions-share-alt',
+        'actions-check-markstate' => 'actions-square',
+        'actions-system-shortcut-active' => 'actions-star',
+        'actions-system-shortcut-new' => 'actions-star',
+        'actions-version-swap-version' => 'actions-swap',
+        'actions-version-swap-workspace' => 'actions-swap',
+        'sysnote-type-3' => 'actions-thumbtack',
+        'actions-edit-unhide' => 'actions-toggle-off',
+        'actions-edit-hide' => 'actions-toggle-on',
+        'actions-edit-undo' => 'actions-undo',
+        'actions-edit-upload' => 'actions-upload',
+        'actions-system-backend-user-emulate' => 'actions-user-emulate',
+        'actions-system-backend-user-switch' => 'actions-user-switch',
+        'actions-variable-select' => 'actions-variable-add',
+        'information-application-context' => 'actions-window-cog',
+        'empty-empty' => 'miscellaneous-placeholder',
+        'module-templates' => 'module-template',
+        'module-tstemplate' => 'module-tsconfig',
+        'spinner-circle-light' => 'spinner-circle',
+        'spinner-circle-dark' => 'spinner-circle',
+    ];
+
+    private static $flippedAliasMap;
+
+    /**
+     * Wandelt in T3 10 und höher alte Icon-Bezeichner in die entsprechenden neuen Bezeichner um.
+     * Für ältere T3 Versionen werden die neuen Bezeichner, sofern vorhanden, in die entsprechenden
+     * alten Icons umgewandelt.
+     *
+     * @see https://typo3.github.io/TYPO3.Icons/index.html
+     *
+     * @param string|null $identifier
+     * @return mixed
+     */
+    public static function alias(?string $identifier)
+    {
+        if (TYPO3::isTYPO104OrHigher()) {
+            return self::$aliasMap[$identifier] ?? $identifier;
+        }
+
+        if (empty(self::$flippedAliasMap)) {
+            self::$flippedAliasMap = array_flip(self::$aliasMap);
+        }
+
+        return self::$flippedAliasMap[$identifier] ?? $identifier;
+    }
+}
diff --git a/Classes/Backend/Utility/Icons.php b/Classes/Backend/Utility/Icons.php
index 86062c1e..616df36f 100644
--- a/Classes/Backend/Utility/Icons.php
+++ b/Classes/Backend/Utility/Icons.php
@@ -106,28 +106,25 @@ public static function debugSprites()
     /**
      * @param string $iconName
      * @param array  $options
-     * @param array  $overlays
      *
-     * @return string
+     * @see https://typo3.github.io/TYPO3.Icons/index.html
+     *
+     * @return string|\TYPO3\CMS\Core\Imaging\Icon
      */
     public static function getSpriteIcon(
         $iconName,
-        array $options = [],
-        array $overlays = []
+        array $options = []
     ) {
-        // @TODO: shoult be used for TYPO3 7 too!
-        if (!TYPO3::isTYPO80OrHigher()) {
-            $class = static::getIconUtilityClass();
-
-            return $class::getSpriteIcon($iconName, $options, $overlays);
-        }
+        $iconName = IconMap::alias($iconName);
 
         $size = \TYPO3\CMS\Core\Imaging\Icon::SIZE_SMALL;
         if (!empty($options['size'])) {
             $size = $options['size'];
         }
+        $asIcon = $options['asIcon'] ?? false;
+        $icon = static::getIconFactory()->getIcon($iconName, $size);
 
-        return static::getIconFactory()->getIcon($iconName, $size)->render();
+        return $asIcon ? $icon : $icon->render();
     }
 
     /**
diff --git a/Classes/Frontend/Request/Parameters.php b/Classes/Frontend/Request/Parameters.php
index e666d879..17f1d93a 100644
--- a/Classes/Frontend/Request/Parameters.php
+++ b/Classes/Frontend/Request/Parameters.php
@@ -141,13 +141,25 @@ public static function getPostAndGetParametersMerged($parameterName)
     }
 
     /**
-     * @see \TYPO3\CMS\Core\Utility\GeneralUtility::_GP
+     * alias for _GP.
      *
      * @param string $parameter Key (variable name) from GET or POST vars
      *
      * @return array|string returns the GET vars merged recursively onto the POST vars
      */
     public static function getPostOrGetParameter($parameterName)
+    {
+        return self::_GP($parameterName);
+    }
+
+    /**
+     * @see \TYPO3\CMS\Core\Utility\GeneralUtility::_GP
+     *
+     * @param string $parameter Key (variable name) from GET or POST vars
+     *
+     * @return array|string returns the GET vars merged recursively onto the POST vars
+     */
+    public static function _GP($parameterName)
     {
         $utility = Typo3Classes::getGeneralUtilityClass();
 
diff --git a/Classes/Utility/Strings.php b/Classes/Utility/Strings.php
index cdd5b48c..e3174350 100644
--- a/Classes/Utility/Strings.php
+++ b/Classes/Utility/Strings.php
@@ -189,8 +189,8 @@ public static function underscoredToLowerCamelCase($string)
     }
 
     /**
-     * Returns a given string with underscores as lowerCamelCase.
-     * Example: Converts minimal_value to minimalValue.
+     * Returns a given string with underscores as UpperCamelCase.
+     * Example: Converts minimal_value to MinimalValue.
      *
      * @param string $string: String to be converted to lowercase underscore
      *
@@ -201,6 +201,18 @@ public static function underscoredToUpperCamelCase($string)
         return T3General::underscoredToUpperCamelCase($string);
     }
 
+    /**
+     * Returns a given string with dashes as UpperCamelCase.
+     * Example: Converts blog-example to BlogExample.
+     *
+     * @param string $string String to be converted to camel case
+     * @return string UpperCamelCasedWord
+     */
+    public static function dashedToUpperCamelCase($string)
+    {
+        return str_replace(' ', '', ucwords(str_replace('-', ' ', strtolower($string))));
+    }
+
     /**
      * Convert an array with hexadecimal byte values to binary string.
      *
diff --git a/Classes/Utility/T3General.php b/Classes/Utility/T3General.php
index 03211d7c..08b6a266 100644
--- a/Classes/Utility/T3General.php
+++ b/Classes/Utility/T3General.php
@@ -255,4 +255,26 @@ public static function milliseconds()
 
         return $util::milliseconds();
     }
+
+    /**
+     * Removes an item from a comma-separated list of items.
+     *
+     * If $element contains a comma, the behaviour of this method is undefined.
+     * Empty elements in the list are preserved.
+     *
+     * @param string $element Element to remove
+     * @param string $list Comma-separated list of items (string)
+     * @return string New comma-separated list of items
+     */
+    public static function rmFromList($element, $list)
+    {
+        $items = explode(',', $list);
+        foreach ($items as $k => $v) {
+            if ($v == $element) {
+                unset($items[$k]);
+            }
+        }
+
+        return implode(',', $items);
+    }
 }
diff --git a/Classes/Utility/TYPO3.php b/Classes/Utility/TYPO3.php
index 4a566fa3..49253696 100644
--- a/Classes/Utility/TYPO3.php
+++ b/Classes/Utility/TYPO3.php
@@ -165,6 +165,16 @@ public static function isTYPO121OrHigher()
         return self::isTYPO3VersionOrHigher(12001000);
     }
 
+    /**
+     * Prüft, ob mindestens TYPO3 Version 13.0 vorhanden ist.
+     *
+     * @return bool
+     */
+    public static function isTYPO130OrHigher()
+    {
+        return self::isTYPO3VersionOrHigher(13000000);
+    }
+
     private static $TYPO3_VERSION = false;
 
     /**
diff --git a/Configuration/JavaScriptModules.php b/Configuration/JavaScriptModules.php
new file mode 100644
index 00000000..d70d76d2
--- /dev/null
+++ b/Configuration/JavaScriptModules.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'dependencies' => [
+        'backend',
+    ],
+    'imports' => [
+        '@sys25/rn_base/' => 'EXT:rn_base/Resources/Public/JavaScript/es6/',
+    ],
+];
diff --git a/Resources/Public/JavaScript/Toolbox.js b/Resources/Public/JavaScript/Toolbox.js
new file mode 100644
index 00000000..6f4e50e0
--- /dev/null
+++ b/Resources/Public/JavaScript/Toolbox.js
@@ -0,0 +1,60 @@
+
+define([], function(jQuery) {
+
+const FormTool = {
+
+    init: function() {
+        const self = this;
+        // Alle reload Elemente suchen
+        const elems = document.querySelectorAll('[data-action-submit="$form"][data-global-event]');
+        elems.forEach(function(elem) {
+            var event = elem.getAttribute('data-global-event');
+            elem.addEventListener(event, function() {
+                // Alle hidden Submit-Buttons suchen und entfernen
+                // Das ist hier kein Problem, weil sofort der Reload erfolgt
+                const hiddens = document.querySelectorAll('input[type="hidden"].rnbase-modal-submit-btn')
+                hiddens.forEach(function(hidden){
+                    if (hidden.form) {
+                        hidden.form.removeChild(hidden);
+                    }
+                })
+            });
+        });
+        const editForm = document.forms['editform'];
+
+        // const btns = document.querySelectorAll('button[type="submit"].rnbase-btn.t3js-modal-trigger, input[type="submit"].rnbase-btn.t3js-modal-trigger');
+        const btns = document.querySelectorAll('button[type="submit"].rnbase-btn, input[type="submit"].rnbase-btn');
+        btns.forEach(function(btn) {
+            btn.addEventListener('click', function(evt) {
+                const hiddenField = document.querySelector('input[type="hidden"].rnbase-modal-submit-btn');
+                if (btn.classList.contains('t3js-modal-trigger')) {
+                    // Hole den Namen des Submit-Buttons
+                    hiddenField.name = btn.getAttribute('name');
+                    hiddenField.value = btn.getAttribute('value');
+                } else {
+                    hiddenField.name = '_none';
+                }
+            })
+        });
+        if (editForm) {
+            // Das hidden-Feld wird den Namen des Submit-Buttons bei Modal-Dialogen schicken
+            var hiddenField = document.querySelector('input[type="hidden"].rnbase-modal-submit-btn');
+            if (!hiddenField) {
+                hiddenField = document.createElement('input');
+                hiddenField.type = 'hidden';
+                hiddenField.className = 'rnbase-modal-submit-btn';
+                hiddenField.name = '_none';
+
+                // Füge das hidden-Feld zum Formular hinzu
+                editForm.appendChild(hiddenField);
+            }
+        }
+
+        console.info('Toolbox loaded');
+    }
+}
+
+FormTool.init();
+});
+
+
diff --git a/Resources/Public/JavaScript/es6/toolbox.js b/Resources/Public/JavaScript/es6/toolbox.js
new file mode 100644
index 00000000..1c0d14d6
--- /dev/null
+++ b/Resources/Public/JavaScript/es6/toolbox.js
@@ -0,0 +1,59 @@
+import jQuery from 'jquery';
+
+
+const FormTool = {
+
+    init: function() {
+        const self = this;
+        // Alle reload Elemente suchen
+        const elems = document.querySelectorAll('[data-action-submit="$form"][data-global-event]');
+        elems.forEach(function(elem) {
+            var event = elem.getAttribute('data-global-event');
+            elem.addEventListener(event, function() {
+                // Alle hidden Submit-Buttons suchen und entfernen
+                // Das ist hier kein Problem, weil sofort der Reload erfolgt
+                const hiddens = document.querySelectorAll('input[type="hidden"].rnbase-modal-submit-btn')
+                hiddens.forEach(function(hidden){
+                    if (hidden.form) {
+                        hidden.form.removeChild(hidden);
+                    }
+                })
+            });
+        });
+        const editForm = document.forms['editform'];
+
+        // const btns = document.querySelectorAll('button[type="submit"].rnbase-btn.t3js-modal-trigger, input[type="submit"].rnbase-btn.t3js-modal-trigger');
+        const btns = document.querySelectorAll('button[type="submit"].rnbase-btn, input[type="submit"].rnbase-btn');
+        btns.forEach(function(btn) {
+            btn.addEventListener('click', function(evt) {
+                const hiddenField = document.querySelector('input[type="hidden"].rnbase-modal-submit-btn');
+                if (btn.classList.contains('t3js-modal-trigger')) {
+                    // Hole den Namen des Submit-Buttons
+                    hiddenField.name = btn.getAttribute('name');
+                    hiddenField.value = btn.getAttribute('value');
+                } else {
+                    hiddenField.name = '_none';
+                }
+            })
+        });
+        if (editForm) {
+            // Das hidden-Feld wird den Namen des Submit-Buttons bei Modal-Dialogen schicken
+            var hiddenField = document.querySelector('input[type="hidden"].rnbase-modal-submit-btn');
+            if (!hiddenField) {
+                hiddenField = document.createElement('input');
+                hiddenField.type = 'hidden';
+                hiddenField.className = 'rnbase-modal-submit-btn';
+                hiddenField.name = '_none';
+
+                // Füge das hidden-Feld zum Formular hinzu
+                editForm.appendChild(hiddenField);
+            }
+        }
+
+        console.info('Toolbox loaded');
+    }
+}
+
+FormTool.init();
+
+
diff --git a/composer.json b/composer.json
index ffb59520..425bdcea 100644
--- a/composer.json
+++ b/composer.json
@@ -158,7 +158,8 @@
 			]
 		},
 		"branch-alias": {
-			"dev-master": "1.17.x-dev"
+			"dev-master": "1.17.x-dev",
+			"dev-feature/support-for-sph": "1.17.x-dev"
 		}
 	}
 }
diff --git a/tests/Classes/Backend/Form/ToolBoxTest.php b/tests/Classes/Backend/Form/ToolBoxTest.php
index 1d499369..89ca8f11 100644
--- a/tests/Classes/Backend/Form/ToolBoxTest.php
+++ b/tests/Classes/Backend/Form/ToolBoxTest.php
@@ -2,6 +2,7 @@
 
 namespace Sys25\RnBase\Backend\Form;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use Sys25\RnBase\Backend\Template\Override\DocumentTemplate;
 use Sys25\RnBase\Testing\BaseTestCase;
 use Sys25\RnBase\Utility\TYPO3;
@@ -39,6 +40,8 @@
  */
 class ToolBoxTest extends BaseTestCase
 {
+    use ProphecyTrait;
+
     protected function setUp(): void
     {
         if (TYPO3::isTYPO90OrHigher()) {
@@ -86,14 +89,23 @@ public function testCreateSelectByArray()
      */
     public function testCreateSelectByArrayIfReloadOption()
     {
-        $formTool = tx_rnbase::makeInstance(ToolBox::class);
+        /** @var ToolBox $formTool */
+        $formTool = $this->getMock(ToolBox::class, ['insertJsModule']);
+        $formTool
+            ->expects(self::once())
+            ->method('insertJsModule')
+            ->with('@sys25/rn_base/toolbox.js');
+
         $select = $formTool->createSelectByArray(
             'testSelect',
             1,
             [1 => 'John', 2 => 'Doe'],
             ['reload' => true]
         );
-        $expectedSelect = '<select name="testSelect" class="select" onchange=" this.form.submit(); " ><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
+        $expectedSelect = '<select name="testSelect" class="select" data-global-event="change" data-action-submit="$form"><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
+        if (!TYPO3::isTYPO104OrHigher()) {
+            $expectedSelect = '<select name="testSelect" class="select" onchange=" this.form.submit(); "><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
+        }
 
         self::assertEquals($expectedSelect, $select);
     }
@@ -110,7 +122,7 @@ public function testCreateSelectByArrayIfOnchangeOption()
             [1 => 'John', 2 => 'Doe'],
             ['onchange' => 'myJsFunction']
         );
-        $expectedSelect = '<select name="testSelect" class="select" onchange="myJsFunction" ><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
+        $expectedSelect = '<select name="testSelect" class="select" onchange="myJsFunction"><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
 
         self::assertEquals($expectedSelect, $select);
     }
@@ -120,15 +132,24 @@ public function testCreateSelectByArrayIfOnchangeOption()
      */
     public function testCreateSelectByArrayIfReloadAndOnchangeOption()
     {
-        $formTool = tx_rnbase::makeInstance(ToolBox::class);
+        /** @var ToolBox $formTool */
+        $formTool = $this->getMock(ToolBox::class, ['insertJsModule']);
+        $formTool
+            ->expects(self::once())
+            ->method('insertJsModule')
+            ->with('@sys25/rn_base/toolbox.js');
+
         $select = $formTool->createSelectByArray(
             'testSelect',
             1,
             [1 => 'John', 2 => 'Doe'],
             ['onchange' => 'myJsFunction', 'reload' => true]
         );
-        $expectedSelect = '<select name="testSelect" class="select" onchange=" this.form.submit(); myJsFunction" ><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
+        $expectedSelect = '<select name="testSelect" class="select" data-global-event="change" data-action-submit="$form" onchange="myJsFunction"><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
 
+        if (!TYPO3::isTYPO104OrHigher()) {
+            $expectedSelect = '<select name="testSelect" class="select" onchange=" this.form.submit(); myJsFunction"><option value="1" selected="selected">John</option><option value="2" >Doe</option></select>';
+        }
         self::assertEquals($expectedSelect, $select);
     }
 
@@ -190,38 +211,6 @@ public function testGetJavaScriptForLinkToDataHandlerActionInTypo387()
         );
     }
 
-    /**
-     * @group integration
-     *
-     * @TODO: refactor, requires $GLOBALS['BE_USER']!
-     */
-    public function testGetJavaScriptForLinkToDataHandlerActionAddsNecessaryJavaScriptsInTypo387()
-    {
-        $formTool = $this->getAccessibleMock(ToolBox::class, ['getBaseJavaScriptCode']);
-        $formTool
-            ->expects(self::once())
-            ->method('getBaseJavaScriptCode')
-            ->will(self::returnValue('javascriptCode'));
-
-        $pageRenderer = $this->getMock('stdClass', ['addJsInlineCode']);
-        $pageRenderer
-            ->expects(self::once())
-            ->method('addJsInlineCode')
-            ->with('rnBaseMethods', 'javascriptCode');
-
-        $document = $this->getMock(DocumentTemplate::class, ['getPageRenderer']);
-        $document
-            ->expects(self::once())
-            ->method('getPageRenderer')
-            ->will(self::returnValue($pageRenderer));
-
-        $formTool->init($document, null);
-        $options = ['test'];
-        $urlParameters = 'someParameters';
-
-        $formTool->_call('getJavaScriptForLinkToDataHandlerAction', $urlParameters, $options);
-    }
-
     /**
      * @group integration
      *
@@ -265,8 +254,8 @@ public function testCreateLink()
         unset($options['params']['id']);
 
         self::assertEquals(
-            sprintf('<a href="#" class="%s" onclick="window.location.href=%s; return false;" >mylabel</a>',
-                ToolBox::CSS_CLASS_BTN, htmlspecialchars("'scriptUrl'")),
+            sprintf('<a href="%s" class="%s" title="mylabel">mylabel</a>',
+                htmlspecialchars('scriptUrl'), ToolBox::CSS_CLASS_BTN),
             $formTool->createLink($urlParameters, $pid, 'mylabel', $options)
         );
     }
@@ -311,8 +300,8 @@ public function testCreateLinkWithHover()
             ->will(self::returnValue('scriptUrl'));
 
         self::assertEquals(
-            sprintf('<a href="#" class="%s" onclick="window.location.href=%s; return false;" title="hoverTitle">mylabel</a>',
-                ToolBox::CSS_CLASS_BTN, htmlspecialchars("'scriptUrl'")),
+            sprintf('<a href="%s" class="%s" title="hoverTitle">mylabel</a>',
+                'scriptUrl', ToolBox::CSS_CLASS_BTN),
             $formTool->createLink($urlParameters, 0, 'mylabel', $options)
         );
     }
@@ -333,8 +322,8 @@ public function testCreateLinkWithCssClass()
             ->will(self::returnValue('scriptUrl'));
 
         self::assertEquals(
-            sprintf('<a href="#" class="myClass" onclick="window.location.href=%s; return false;" >mylabel</a>',
-                htmlspecialchars("'scriptUrl'")),
+            sprintf('<a href="%s" class="myClass" title="mylabel">mylabel</a>',
+                'scriptUrl'),
             $formTool->createLink($urlParameters, 22, 'mylabel', $options)
         );
     }
@@ -360,7 +349,7 @@ public function testCreateLinkWithIconForTypo387()
             ->will(self::returnValue('jumpUrl'));
 
         self::assertRegExp(
-            '/<a href="#" class="myClass" onclick="window.location.href=\'jumpUrl\'; return false;" >.*<img.*actions\-add\.svg" width="16" height="16".*<\/a>/s',
+            '/<a href="jumpUrl" class="myClass" title="mylabel">.*<img.*actions-add\.svg" width="16" height="16".*<\/a>/s',
             $formTool->createLink($urlParameters, 0, 'mylabel', $options)
         );
     }
@@ -386,7 +375,7 @@ public function testCreateLinkWithIconAndSizeForTypo387()
             ->will(self::returnValue('jumpUrl'));
 
         self::assertRegExp(
-            '/<a href="#" class="myClass" onclick="window.location.href=\'jumpUrl\'; return false;" >.*<img.*actions\-add\.svg" width="32" height="32".*<\/a>/s',
+            '/<a href="jumpUrl" class="myClass" title="mylabel">.*<img.*actions\-add\.svg" width="32" height="32".*<\/a>/s',
             $formTool->createLink($urlParameters, 0, 'mylabel', $options)
         );
     }
@@ -399,15 +388,16 @@ public function testCreateLinkForDataHandlerAction()
         $urlParameters = 'someParameters';
         $options = ['test' => 'value'];
 
-        $formTool = $this->getMock(ToolBox::class, ['getJavaScriptForLinkToDataHandlerAction']);
+        /** @var ToolBox $formTool */
+        $formTool = $this->getMock(ToolBox::class, ['buildDataHandlerUri']);
         $formTool
             ->expects(self::once())
-            ->method('getJavaScriptForLinkToDataHandlerAction')
-            ->with($urlParameters, $options)
-            ->will(self::returnValue('jumpUrl'));
+            ->method('buildDataHandlerUri')
+            ->with($urlParameters, '')
+            ->will(self::returnValue('someTceUrl'));
 
         self::assertEquals(
-            '<a href="#" class="'.ToolBox::CSS_CLASS_BTN.'" onclick="jumpUrl" >mylabel</a>',
+            '<a href="someTceUrl" class="btn btn-default btn-sm" title="mylabel">mylabel</a>',
             $formTool->createLinkForDataHandlerAction($urlParameters, 'mylabel', $options)
         );
     }
@@ -418,17 +408,17 @@ public function testCreateLinkForDataHandlerAction()
     public function testCreateLinkForDataHandlerActionWithHover()
     {
         $urlParameters = 'someParameters';
-        $options = ['hover' => 'hoverTitle'];
+        $options = [ToolBox::OPTION_HOVER_TEXT => 'hoverTitle'];
 
-        $formTool = $this->getMock(ToolBox::class, ['getJavaScriptForLinkToDataHandlerAction']);
+        $formTool = $this->getMock(ToolBox::class, ['buildDataHandlerUri']);
         $formTool
             ->expects(self::once())
-            ->method('getJavaScriptForLinkToDataHandlerAction')
-            ->with($urlParameters, $options)
-            ->will(self::returnValue('jumpUrl'));
+            ->method('buildDataHandlerUri')
+            ->with($urlParameters, '')
+            ->will(self::returnValue('someTceUrl'));
 
         self::assertEquals(
-            '<a href="#" class="'.ToolBox::CSS_CLASS_BTN.'" onclick="jumpUrl" title="hoverTitle">mylabel</a>',
+            '<a href="someTceUrl" class="btn btn-default btn-sm" title="hoverTitle">mylabel</a>',
             $formTool->createLinkForDataHandlerAction($urlParameters, 'mylabel', $options)
         );
     }
@@ -441,15 +431,15 @@ public function testCreateLinkForDataHandlerActionWithCssClass()
         $urlParameters = 'someParameters';
         $options = ['class' => 'myClass'];
 
-        $formTool = $this->getMock(ToolBox::class, ['getJavaScriptForLinkToDataHandlerAction']);
+        $formTool = $this->getMock(ToolBox::class, ['buildDataHandlerUri']);
         $formTool
             ->expects(self::once())
-            ->method('getJavaScriptForLinkToDataHandlerAction')
-            ->with($urlParameters, $options)
-            ->will(self::returnValue('jumpUrl'));
+            ->method('buildDataHandlerUri')
+            ->with($urlParameters, '')
+            ->will(self::returnValue('someTceUrl'));
 
         self::assertEquals(
-            '<a href="#" class="myClass" onclick="jumpUrl" >mylabel</a>',
+            '<a href="someTceUrl" class="myClass" title="mylabel">mylabel</a>',
             $formTool->createLinkForDataHandlerAction($urlParameters, 'mylabel', $options)
         );
     }