Merge branch 'F9052_Report_CodeMirror' into 'develop'

F9052: Minimized codemirror js files and changed Gruntfile function. Added...

See merge request !450

Documentation/Form.rst

@@ -1601,6 +1601,10 @@ Type: editor
 
     editor-content_css = fileadmin/custom.css
 
+* Set 'editorType' to use highlighted syntax inside the editor like reports. Available: codemirror. Example: ::
+
+    editorType = codemirror
+
 * *FormElement.size* = <min_height>,<max_height>: in pixels, including top and bottom bars. E.g.: 300,600
 
 

Documentation/Installation.rst

@@ -280,8 +280,8 @@ Setup CSS & JS
         file13 = typo3conf/ext/qfq/Resources/Public/JavaScript/widget-output.min.js
         file14 = typo3conf/ext/qfq/Resources/Public/JavaScript/moment.min.js
         file15 = typo3conf/ext/qfq/Resources/Public/JavaScript/bootstrap-datetimepicker.min.js
-        file16 = typo3conf/ext/qfq/Resources/Public/JavaScript/codemirror.js
-        file17 = typo3conf/ext/qfq/Resources/Public/JavaScript/code-mirror-mode/sql/sql.js
+        file16 = typo3conf/ext/qfq/Resources/Public/JavaScript/codemirror.min.js
+        file17 = typo3conf/ext/qfq/Resources/Public/JavaScript/code-mirror-mode/sql/sql.min.js
 
         # Only needed in case FormElement 'annotate' is used.
         file18 = typo3conf/ext/qfq/Resources/Public/JavaScript/fabric.min.js
@@ -500,6 +500,8 @@ Extension Manager: QFQ Configuration
 +-----------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
 | thumbnailDirPublic                | typo3temp/qfqThumbnail                                | Both thumbnail directories will be created if not existing.                |
 +-----------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
+| editInlineReports                 | yes                                                   | Activate/deactivate editing inline reports.                                |
++-----------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
 | cmdInkscape                       | inkscape                                              | If inkscape is not available, specify an empty string.                     |
 +-----------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
 | cmdConvert                        | convert                                               | Image-/GraphicsMagics 'convert' is recommended.                            |

Documentation/Release.rst

@@ -144,8 +144,8 @@ Please update your CSS and JS (T3 Main Template > Setup) to include the new Date
   page.includeCSS.file09 = typo3conf/ext/qfq/Resources/Public/Css/codemirror.css
   page.includeJS.file14 = typo3conf/ext/qfq/Resources/Public/JavaScript/moment.min.js
   page.includeJS.file15 = typo3conf/ext/qfq/Resources/Public/JavaScript/bootstrap-datetimepicker.min.js
-  page.includeJS.file16 = typo3conf/ext/qfq/Resources/Public/JavaScript/codemirror.js
-  page.includeJS.file17 = typo3conf/ext/qfq/Resources/Public/JavaScript/code-mirror-mode/sql/sql.js
+  page.includeJS.file16 = typo3conf/ext/qfq/Resources/Public/JavaScript/codemirror.min.js
+  page.includeJS.file17 = typo3conf/ext/qfq/Resources/Public/JavaScript/code-mirror-mode/sql/sql.min.js
 
 Features
 ^^^^^^^^

Gruntfile.js

@@ -579,6 +579,14 @@ module.exports = function (grunt) {
             qfqValidator: {
                 src: ['javascript/src/Plugins/validator.js'],
                 dest: typo3_js + 'validator.min.js'
+            },
+            codeMirror: {
+                src: ['node_modules/codemirror/lib/codemirror.js'],
+                dest: typo3_js + 'codemirror.min.js'
+            },
+            codeMirrorSql: {
+                src: ['node_modules/codemirror/mode/sql/sql.js'],
+                dest: typo3_js + 'code-mirror-mode/sql/sql.min.js'
             }
         },
         jshint: {

extension/Classes/Core/Constants.php

@@ -730,6 +730,7 @@ const DOWNLOAD_POPUP_REPLACE_TEXT = '#downloadPopupReplaceText#';
 const DOWNLOAD_POPUP_REPLACE_TITLE = '#downloadPopupReplaceTitle#';
 const SYSTEM_DRAG_AND_DROP_JS = 'hasDragAndDropJS';
 const SYSTEM_SQL_DIRECT_DOWNLOAD = 'sqlDirect'; // becomes sqlDirectdownload.php, sqlDirectdl.php, sqlDirectdl2.php, sqlDirectdl3.php
+const SYSTEM_EDIT_INLINE_REPORTS = 'editInlineReports';
 
 const SYSTEM_PARAMETER_LANGUAGE_FIELD_NAME = 'parameterLanguageFieldName';
 const CSS_REQUIRED_RIGHT = 'required-right';

extension/Classes/Core/QuickFormQuery.php

@@ -1672,6 +1672,14 @@ class QuickFormQuery {
 
         $beUserLoggedIn = $this->store->getVar(TYPO3_BE_USER, STORE_TYPO3, SANITIZE_ALLOW_ALNUMX);
         $pageTitle = $this->store->getVar(TYPO3_PAGE_TITLE,STORE_TYPO3,SANITIZE_ALLOW_ALNUMX);
+        $systemInlineReport = $this->store->getVar(SYSTEM_EDIT_INLINE_REPORTS,STORE_SYSTEM,SANITIZE_ALLOW_ALLBUT);
+        if($systemInlineReport === '1') {
+            $systemInlineReport = true;
+        } else {
+            $systemInlineReport = false;
+        }
+        $this->inlineReport = $systemInlineReport;
+
         if ($beUserLoggedIn && $this->inlineReport) {
             $html .= $this->buildInlineReport($this->t3data[T3DATA_UID] ?? null, $this->t3data[T3DATA_REPORT_PATH_FILENAME] ?? null,
                 $this->t3data[T3DATA_BODYTEXT_RAW] ?? '', $this->t3data[T3DATA_HEADER] ?? '', $pageTitle ?? '');

extension/ext_conf_template.txt

@@ -19,6 +19,9 @@ thumbnailDirSecure = fileadmin/protected/qfqThumbnail
 # cat=config/config; type=string; label=Thumbnail directory 'public':Default is 'typo3temp/qfqThumbnail'. Will be used by a special columnname '_thumbnail'.
 thumbnailDirPublic = typo3temp/qfqThumbnail
 
+# cat=config/config; type=boolean; label=Show edit inline reports
+editInlineReports = 1
+
 # cat=config/config; type=string; label=Command 'inkscape':Default is 'inkscape'. Will be used to convert SVG to images (png). An empty string disables `inkscape`. If it is not available, `convert` will be used instead.
 cmdInkscape = inkscape