From d0237436c41f376e3ee5976fba8b6c622f73b86b Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Fri, 30 Jul 2021 17:40:01 +0200 Subject: [PATCH] Fix new namespace of slub_digitalcollections --- .editorconfig | 66 +++++++++++++++++++ Classes/Controller/StatisticController.php | 2 +- .../slub_web_digas/Layouts/KitodoPage.html | 12 +++- .../slub_web_digas/Partials/PageView.html | 8 ++- .../Templates/Statistic/Administration.html | 2 +- .../Templates/Statistic/ViewSingle.html | 2 +- ext_emconf.php | 4 +- 7 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..14b9126 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,66 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# CSS-Files +[*.css] +indent_style = space +indent_size = 4 + +# HTML-Files +[*.html] +indent_style = space +indent_size = 4 + +# TMPL-Files +[*.tmpl] +indent_style = space +indent_size = 4 + +# LESS-Files +[*.less] +indent_style = space +indent_size = 4 + +# JS-Files +[*.js] +indent_style = space +indent_size = 4 + +# PHP-Files +[*.php] +indent_style = space +indent_size = 4 + +# MD-Files +[*.md] +indent_style = space +indent_size = 4 + +# ReST-Files +[*.rst] +indent_style = space +indent_size = 3 + +# TypoScript +[*.typoscript] +indent_style = space +indent_size = 4 + +# YML-Files +[{*.yml,*.yaml}] +indent_style = space +indent_size = 4 + +# package.json, composer.json or .travis.yml +[{package.json,composer.json,.travis.yml}] +indent_style = space +indent_size = 2 diff --git a/Classes/Controller/StatisticController.php b/Classes/Controller/StatisticController.php index 21c68f7..d10d415 100644 --- a/Classes/Controller/StatisticController.php +++ b/Classes/Controller/StatisticController.php @@ -29,7 +29,7 @@ use In2code\Femanager\Utility\LocalizationUtility; use Slub\DigasFeManagement\Domain\Model\Statistic; use Slub\DigasFeManagement\Domain\Validator\StatisticTstampValidator; -use Slub\DigitalCollections\Helpers\GetDoc; +use Slub\SlubDigitalcollections\Helpers\GetDoc; use TYPO3\CMS\Core\Messaging\FlashMessage; use TYPO3\CMS\Core\Utility\GeneralUtility; diff --git a/Resources/Private/Extensions/slub_web_digas/Layouts/KitodoPage.html b/Resources/Private/Extensions/slub_web_digas/Layouts/KitodoPage.html index 329a372..91634aa 100755 --- a/Resources/Private/Extensions/slub_web_digas/Layouts/KitodoPage.html +++ b/Resources/Private/Extensions/slub_web_digas/Layouts/KitodoPage.html @@ -1,6 +1,10 @@ -{namespace dv=Slub\SlubWebDigas\ViewHelpers} -{namespace dc=Slub\DigitalCollections\ViewHelpers} -{namespace digas=Slub\DigasFeManagement\ViewHelpers} + + " /> @@ -30,3 +34,5 @@ + + diff --git a/Resources/Private/Extensions/slub_web_digas/Partials/PageView.html b/Resources/Private/Extensions/slub_web_digas/Partials/PageView.html index e7f0401..bade0fa 100644 --- a/Resources/Private/Extensions/slub_web_digas/Partials/PageView.html +++ b/Resources/Private/Extensions/slub_web_digas/Partials/PageView.html @@ -1,5 +1,7 @@ -{namespace dc=Slub\DigitalCollections\ViewHelpers} -
+
@@ -240,3 +242,5 @@
+ + diff --git a/Resources/Private/Templates/Statistic/Administration.html b/Resources/Private/Templates/Statistic/Administration.html index 50e21da..4c67b00 100644 --- a/Resources/Private/Templates/Statistic/Administration.html +++ b/Resources/Private/Templates/Statistic/Administration.html @@ -1,4 +1,4 @@ -{namespace dc=Slub\DigitalCollections\ViewHelpers} +{namespace dc=Slub\SlubDigitalcollections\ViewHelpers} diff --git a/Resources/Private/Templates/Statistic/ViewSingle.html b/Resources/Private/Templates/Statistic/ViewSingle.html index 1441c96..e793ca2 100644 --- a/Resources/Private/Templates/Statistic/ViewSingle.html +++ b/Resources/Private/Templates/Statistic/ViewSingle.html @@ -1,4 +1,4 @@ -{namespace dc=Slub\DigitalCollections\ViewHelpers} +{namespace dc=Slub\SlubDigitalcollections\ViewHelpers} diff --git a/ext_emconf.php b/ext_emconf.php index 7e58c6f..67c7b61 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -10,10 +10,10 @@ 'uploadfolder' => '0', 'createDirs' => '', 'clearCacheOnLoad' => 0, - 'version' => '1.0.0', + 'version' => '1.1.0', 'constraints' => [ 'depends' => [ - 'typo3' => '9.5.0-9.5.99', + 'typo3' => '9.5.28-9.5.99', 'femanager' => '5.4.0', 'fe_change_pwd' => '2.0.0-2.99.99' ],