diff --git a/Classes/Core/Core.php b/Classes/Core/Core.php index ead6e15..233564d 100755 --- a/Classes/Core/Core.php +++ b/Classes/Core/Core.php @@ -336,7 +336,7 @@ public static function loadJquery() { /** @var DocumentTemplate $documentTemplate */ $documentTemplate = self::getDocumentTemplate(); - $pageRenderer = $documentTemplate->getPageRenderer(); + $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class); $pageRenderer->loadJquery(PageRenderer::JQUERY_VERSION_LATEST, 'local', $pageRenderer::JQUERY_NAMESPACE_DEFAULT_NOCONFLICT); } diff --git a/Classes/Duplication/AbstractDuplicationProcess.php b/Classes/Duplication/AbstractDuplicationProcess.php index 3669de8..2fcd372 100755 --- a/Classes/Duplication/AbstractDuplicationProcess.php +++ b/Classes/Duplication/AbstractDuplicationProcess.php @@ -274,6 +274,8 @@ public static function getCleanedDuplicationConfiguration($pageUid, $onlyUsedInS if (!self::$duplicationConfiguration[$pageUid][$siteModificationToken]) { $duplicationConfiguration = Core::sortArrayByPositionValue(TypoScriptUtility::getExtensionConfigurationFromPath('duplication', $pageUid)); + ksort($duplicationConfiguration); + $cleanedDuplicationConfiguration = []; // For HTML convention causes, we replace the lower-camel-case indexes with lower-case-underscored ones. diff --git a/Classes/Utility/TypoScriptUtility.php b/Classes/Utility/TypoScriptUtility.php index b73e801..cf6d7a4 100755 --- a/Classes/Utility/TypoScriptUtility.php +++ b/Classes/Utility/TypoScriptUtility.php @@ -17,9 +17,9 @@ use Romm\SiteFactory\Core\Core; use TYPO3\CMS\Core\TypoScript\ExtendedTemplateService; use TYPO3\CMS\Core\TypoScript\TemplateService; +use TYPO3\CMS\Core\TypoScript\TypoScriptService; use TYPO3\CMS\Core\Utility\ArrayUtility; use TYPO3\CMS\Core\Utility\MathUtility; -use TYPO3\CMS\Extbase\Service\TypoScriptService; use TYPO3\CMS\Frontend\Page\PageRepository; /** diff --git a/Resources/Private/Language/FieldsLocallang.xlf b/Resources/Private/Language/FieldsLocallang.xlf index 521e25a..ed59de4 100755 --- a/Resources/Private/Language/FieldsLocallang.xlf +++ b/Resources/Private/Language/FieldsLocallang.xlf @@ -3,7 +3,6 @@
- The value "%s" is not a correct. @@ -25,7 +24,12 @@ This value must be an integer. - + + This value must match a domain name. + + + You have to fill the select box. + \ No newline at end of file diff --git a/Resources/Private/Layouts/Backend/Default.html b/Resources/Private/Layouts/Backend/Default.html index e32da8e..ed08845 100755 --- a/Resources/Private/Layouts/Backend/Default.html +++ b/Resources/Private/Layouts/Backend/Default.html @@ -16,7 +16,7 @@
diff --git a/Resources/Private/Partials/New/FormStaticMenu.html b/Resources/Private/Partials/New/FormStaticMenu.html index 749495d..45bca3d 100755 --- a/Resources/Private/Partials/New/FormStaticMenu.html +++ b/Resources/Private/Partials/New/FormStaticMenu.html @@ -57,7 +57,7 @@

 ツ
-   +  

diff --git a/Resources/Private/Templates/Administration/Help.html b/Resources/Private/Templates/Administration/Help.html index 4d1ad9b..e719098 100755 --- a/Resources/Private/Templates/Administration/Help.html +++ b/Resources/Private/Templates/Administration/Help.html @@ -79,8 +79,8 @@

Modifier un site

- - + + \ No newline at end of file diff --git a/Resources/Private/Templates/Administration/Index.html b/Resources/Private/Templates/Administration/Index.html index 9d8e6df..320f3c6 100755 --- a/Resources/Private/Templates/Administration/Index.html +++ b/Resources/Private/Templates/Administration/Index.html @@ -1,4 +1,5 @@ {namespace sf=Romm\SiteFactory\ViewHelpers} +{namespace core=TYPO3\CMS\Core\ViewHelpers} @@ -74,6 +75,5 @@

Contains the buttons which will appear in the header menu. - - + \ No newline at end of file diff --git a/Resources/Private/Templates/Administration/New.html b/Resources/Private/Templates/Administration/New.html index a71bce2..48cc747 100755 --- a/Resources/Private/Templates/Administration/New.html +++ b/Resources/Private/Templates/Administration/New.html @@ -96,14 +96,14 @@

Contains the buttons which will appear in the header menu. - - - + + + - + - + diff --git a/Resources/Private/Templates/Administration/ProcessCopy.html b/Resources/Private/Templates/Administration/ProcessCopy.html index c6f6f53..d26b264 100755 --- a/Resources/Private/Templates/Administration/ProcessCopy.html +++ b/Resources/Private/Templates/Administration/ProcessCopy.html @@ -30,12 +30,12 @@

- + - - - - + + + +
    @@ -58,7 +58,7 @@

  • - + [00:00]
      @@ -72,9 +72,7 @@

      - - - - + +

      \ No newline at end of file diff --git a/ext_emconf.php b/ext_emconf.php index 9afff3f..5bc7cab 100755 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -1,32 +1,43 @@ 'Site Factory', - 'state' => 'beta', - 'version' => '0.2.0', - 'description' => 'Replicate and modify an existing website model very easily with a flexible and lean design. Read the code examples to understand and master all the TypoScript configuration, or extend the existing duplication processes. Based on freesite (created by Kasper Skårhøj) this project was originaly conceived by Cyril Wolfangel and is developped and maintained by Romain Canon. Join the project on https://github.com/romaincanon/TYPO3-Site-Factory', - 'category' => 'module', - 'constraints' => [ - 'depends' => [ - 'php' => '5.5.0', - 'extbase' => '6.2', - 'fluid' => '6.2', - 'typo3' => '6.2.0-7.6.99' - ], - 'conflicts' => [], - 'suggests' => [] - ], +/*************************************************************** + * Extension Manager/Repository config file for ext "site_factory". + * + * Auto generated 14-11-2016 15:24 + * + * Manual updates: + * Only the data in the array - everything else is removed by next + * writing. "version" and "dependencies" must not be touched! + ***************************************************************/ - 'author' => 'Romain CANON', - 'author_email' => 'romain.hydrocanon@gmail.com', +$EM_CONF[$_EXTKEY] = array ( + 'title' => 'Site Factory', + 'state' => 'beta', + 'version' => '0.3.0', + 'description' => 'Replicate and modify an existing website model very easily with a flexible and lean design. Read the code examples to understand and master all the TypoScript configuration, or extend the existing duplication processes. Based on freesite (created by Kasper Skårhøj) this project was originaly conceived by Cyril Wolfangel and is developped and maintained by Romain Canon. Join the project on https://github.com/romaincanon/TYPO3-Site-Factory', + 'category' => 'module', + 'constraints' => + array ( + 'depends' => + array ( + 'php' => '5.5.0', + 'extbase' => '7.2', + 'fluid' => '7.2', + 'typo3' => '7.2.0-8.7.99', + ), + 'conflicts' => + array ( + ), + 'suggests' => + array ( + ), + ), + 'author' => 'Romain CANON', + 'author_email' => 'romain.hydrocanon@gmail.com', + 'uploadfolder' => true, + 'createDirs' => 'uploads/tx_sitefactory/_processed_/', + 'clearCacheOnLoad' => 1, + 'clearcacheonload' => true, + 'author_company' => NULL, +); - 'shy' => '', - 'priority' => '', - 'module' => '', - 'internal' => '', - 'uploadfolder' => true, - 'createDirs' => 'uploads/tx_sitefactory/_processed_/', - 'modify_tables' => '', - 'clearCacheOnLoad' => 1, - 'lockType' => '' -];