diff --git a/extension/qfq/qfq/AbstractBuildForm.php b/extension/qfq/qfq/AbstractBuildForm.php index db716faffc3b665886d81325d7def77626d0bde2..154bbf97032d6b0a236aa9a9a0a294d8a033b2e7 100644 --- a/extension/qfq/qfq/AbstractBuildForm.php +++ b/extension/qfq/qfq/AbstractBuildForm.php @@ -167,6 +167,7 @@ abstract class AbstractBuildForm { $htmlSubrecords = ''; $htmlElements = ''; $json = array(); + $flagFabric = false; // After action 'afterSave', it's necessary to reinitialize the FeSpecNative if (!empty($latestFeSpecNative)) { @@ -184,6 +185,9 @@ abstract class AbstractBuildForm { // <form> if ($mode === FORM_LOAD) { $htmlHead = $this->head(); + if (count(OnArray::filter($this->feSpecNative, FE_TYPE, FE_TYPE_ANNOTATE)) > 0) { + $flagFabric = true; + } } $filter = $this->getProcessFilter(); @@ -215,7 +219,7 @@ abstract class AbstractBuildForm { // <form> if ($mode === FORM_LOAD) { $htmlT3vars = $this->prepareT3VarsForSave(); - $htmlTail = $this->tail(); + $htmlTail = $this->tail($flagFabric); $htmlSubrecords = $this->doSubrecords(); } $htmlHidden = $this->buildAdditionalFormElements(); @@ -778,7 +782,7 @@ abstract class AbstractBuildForm { /** * */ - abstract public function tail(); + abstract public function tail($flagFabric = false); /** * @@ -2868,7 +2872,8 @@ abstract class AbstractBuildForm { $attributeImage .= Support::doAttribute('class', 'qfq-fabric-image'); $htmlImage = Support::wrapTag('<img ' . $attributeImage . '>', '', false); - $attributeFabric = Support::doAttribute('id', 'fabric'); +// $attributeFabric = Support::doAttribute('id', 'fabric'); + $attributeFabric = Support::doAttribute('class', FABRIC_CSS_CLASS); $attributeFabric .= Support::doAttribute('data-cotrol-name', $formElement[FE_HTML_ID]); $attributeFabric .= Support::doAttribute('data-buttons', 'typo3conf/ext/qfq/Resources/Public/Json/fabric.buttons.json'); $attributeFabric .= Support::doAttribute('data-emojis', 'typo3conf/ext/qfq/Resources/Public/Json/qfq.emoji.json'); diff --git a/extension/qfq/qfq/BuildFormBootstrap.php b/extension/qfq/qfq/BuildFormBootstrap.php index 35ca762f573fae0859613186ccfd0e7a2a30dec2..7240980416c65cc1a33e07ec7fe18ca6efab4bbe 100644 --- a/extension/qfq/qfq/BuildFormBootstrap.php +++ b/extension/qfq/qfq/BuildFormBootstrap.php @@ -489,7 +489,7 @@ class BuildFormBootstrap extends AbstractBuildForm { /** * @return string */ - public function tail() { + public function tail($flagFabric = false) { $html = ''; $deleteUrl = ''; @@ -531,6 +531,8 @@ class BuildFormBootstrap extends AbstractBuildForm { $dirtyAction = ($this->formSpec[F_DIRTY_MODE] == DIRTY_MODE_NONE) ? '' : "dirtyUrl: '$apiDir/dirty.php',"; + $fabricJs = $flagFabric ? 'var qfqFabric = new QfqNS.Fabric(); qfqFabric.initialize($(".' . FABRIC_CSS_CLASS . '"));' : ''; + $html .= '</form>'; // <form class="form-horizontal" ... $html .= <<<EOF <script type="text/javascript"> @@ -550,6 +552,8 @@ class BuildFormBootstrap extends AbstractBuildForm { }); var qfqRecordList = new QfqNS.QfqRecordList('$apiDeletePhp'); + $fabricJs + }) </script> EOF; diff --git a/extension/qfq/qfq/BuildFormPlain.php b/extension/qfq/qfq/BuildFormPlain.php index 2043768f359cac814aa57198fac4ad8b8fc287ea..39da43689aac311eeaad9ee7548590ba49efcec5 100644 --- a/extension/qfq/qfq/BuildFormPlain.php +++ b/extension/qfq/qfq/BuildFormPlain.php @@ -96,7 +96,7 @@ class BuildFormPlain extends AbstractBuildForm { /** * @return string */ - public function tail() { + public function tail($flagFabric = false) { $html = ''; // $html .= $this->buildNewSip(); diff --git a/extension/qfq/qfq/BuildFormTable.php b/extension/qfq/qfq/BuildFormTable.php index 9fda201e812d879410173d3ae9b74e951cd866d8..7f30c6965d60929dfb352f7aeef712ac33041fda 100644 --- a/extension/qfq/qfq/BuildFormTable.php +++ b/extension/qfq/qfq/BuildFormTable.php @@ -130,7 +130,7 @@ class BuildFormTable extends AbstractBuildForm { /** * @return string */ - public function tail() { + public function tail($flagFabric = false) { $html = ''; diff --git a/extension/qfq/qfq/Constants.php b/extension/qfq/qfq/Constants.php index 205547ea90ecd8a5de6faa9f47ac6357b7ba4a66..d53e165aa4a72c6d3aaab42e4ae6f4b9ae5537bb 100644 --- a/extension/qfq/qfq/Constants.php +++ b/extension/qfq/qfq/Constants.php @@ -1186,3 +1186,5 @@ const AUTOCRON_SQL1 = 'sql1'; const AUTOCRON_UNIT = 'unit'; const AUTOCRON_COUNT = 'count'; +// Annotate +const FABRIC_CSS_CLASS = 'fabric'; \ No newline at end of file