From 5283e51b0d98dff03edfa138634c100a5dbc4017 Mon Sep 17 00:00:00 2001 From: Martin Ficzel Date: Fri, 6 Jan 2023 17:36:22 +0100 Subject: [PATCH] Feature: Adjust rendering of backend module from fluid to fusion --- Classes/Controller/ModuleController.php | 87 +++++----- Configuration/Views.yaml | 6 + .../Backend/Fragments/LanguageSelector.fusion | 32 ++++ Resources/Private/Fusion/Backend/Root.fusion | 12 ++ .../Fusion/Backend/Views/Taxonomy.Edit.fusion | 45 +++++ .../Fusion/Backend/Views/Taxonomy.List.fusion | 155 ++++++++++++++++++ .../Fusion/Backend/Views/Taxonomy.New.fusion | 36 ++++ .../Backend/Views/Vocabulary.Edit.fusion | 46 ++++++ .../Backend/Views/Vocabulary.List.fusion | 104 ++++++++++++ .../Backend/Views/Vocabulary.New.fusion | 35 ++++ .../Private/Layouts/BackendSubModule.html | 11 -- Resources/Private/Partials/FlashMessages.html | 10 -- .../Private/Partials/LanguageSelection.html | 17 -- .../Private/Partials/TaxonRecursive.html | 76 --------- .../Templates/Module/EditTaxonomy.html | 56 ------- .../Templates/Module/EditVocabulary.html | 55 ------- Resources/Private/Templates/Module/Index.html | 109 ------------ .../Private/Templates/Module/NewTaxonomy.html | 23 --- .../Templates/Module/NewVocabulary.html | 23 --- .../Private/Templates/Module/Vocabulary.html | 60 ------- composer.json | 5 +- 21 files changed, 520 insertions(+), 483 deletions(-) create mode 100644 Configuration/Views.yaml create mode 100644 Resources/Private/Fusion/Backend/Fragments/LanguageSelector.fusion create mode 100644 Resources/Private/Fusion/Backend/Root.fusion create mode 100644 Resources/Private/Fusion/Backend/Views/Taxonomy.Edit.fusion create mode 100644 Resources/Private/Fusion/Backend/Views/Taxonomy.List.fusion create mode 100644 Resources/Private/Fusion/Backend/Views/Taxonomy.New.fusion create mode 100644 Resources/Private/Fusion/Backend/Views/Vocabulary.Edit.fusion create mode 100644 Resources/Private/Fusion/Backend/Views/Vocabulary.List.fusion create mode 100644 Resources/Private/Fusion/Backend/Views/Vocabulary.New.fusion delete mode 100644 Resources/Private/Layouts/BackendSubModule.html delete mode 100644 Resources/Private/Partials/FlashMessages.html delete mode 100644 Resources/Private/Partials/LanguageSelection.html delete mode 100644 Resources/Private/Partials/TaxonRecursive.html delete mode 100644 Resources/Private/Templates/Module/EditTaxonomy.html delete mode 100644 Resources/Private/Templates/Module/EditVocabulary.html delete mode 100644 Resources/Private/Templates/Module/Index.html delete mode 100644 Resources/Private/Templates/Module/NewTaxonomy.html delete mode 100644 Resources/Private/Templates/Module/NewVocabulary.html delete mode 100644 Resources/Private/Templates/Module/Vocabulary.html diff --git a/Classes/Controller/ModuleController.php b/Classes/Controller/ModuleController.php index d7f87cf..45026dc 100644 --- a/Classes/Controller/ModuleController.php +++ b/Classes/Controller/ModuleController.php @@ -150,6 +150,7 @@ public function changeContextAction($targetAction, $targetProperty, NodeInterfac $newContextProperties['targetDimensions'][$dimensionName] = $presetName; } $modifiedContext = $this->contextFactory->create(array_merge($contextProperties, $newContextProperties)); + $nodeInModifiedContext = $modifiedContext->getNodeByIdentifier($contextNode->getIdentifier()); $this->redirect($targetAction, null, null, [$targetProperty => $nodeInModifiedContext]); @@ -277,24 +278,27 @@ public function newVocabularyAction(NodeInterface $taxonomyRoot) * Create a new vocabulary * * @param NodeInterface $taxonomyRoot - * @param string $title - * @param string $description + * @param array $properties * @return void */ - public function createVocabularyAction(NodeInterface $taxonomyRoot, $title, $description = '') + public function createVocabularyAction(NodeInterface $taxonomyRoot, array $properties) { $vocabularyNodeType = $this->nodeTypeManager->getNodeType($this->taxonomyService->getVocabularyNodeType()); + $vocabularyProperties = $vocabularyNodeType->getProperties(); $nodeTemplate = new NodeTemplate(); $nodeTemplate->setNodeType($vocabularyNodeType); - $nodeTemplate->setName(CrUtitlity::renderValidNodeName($title)); - $nodeTemplate->setProperty('title', $title); - $nodeTemplate->setProperty('description', $description); + $nodeTemplate->setName(CrUtitlity::renderValidNodeName($properties['title'])); + foreach($properties as $name => $value) { + if (array_key_exists($name, $vocabularyProperties)) { + $nodeTemplate->setProperty($name, $value); + } + } $vocabulary = $taxonomyRoot->createNodeFromTemplate($nodeTemplate); $this->addFlashMessage( - sprintf('Created vocabulary %s at path %s', $title, $vocabulary->getPath()) + sprintf('Created vocabulary %s at path %s', $properties['title'], $vocabulary->getLabel()) ); $this->redirect('index', null, null, ['root' => $taxonomyRoot]); } @@ -317,26 +321,24 @@ public function editVocabularyAction(NodeInterface $vocabulary) * Apply changes to the given vocabulary * * @param NodeInterface $vocabulary - * @param string $title - * @param string $description + * @param array $properties * @return void */ - public function updateVocabularyAction(NodeInterface $vocabulary, $title, $description = '') + public function updateVocabularyAction(NodeInterface $vocabulary, array $properties) { $taxonomyRoot = $this->taxonomyService->getRoot($vocabulary->getContext()); - $previousTitle = $vocabulary->getProperty('title'); - $previousDescription = $vocabulary->getProperty('description'); - - if ($previousTitle !== $title) { - $vocabulary->setProperty('title', $title); - } - - if ($previousDescription !== $description) { - $vocabulary->setProperty('description', $description); + $vocabularyProperties = $vocabulary->getNodeType()->getProperties(); + foreach($properties as $name => $value) { + if (array_key_exists($name, $vocabularyProperties)) { + $previous = $vocabulary->getProperty($name); + if ($previous !== $value) { + $vocabulary->setProperty($name, $value); + } + } } $this->addFlashMessage( - sprintf('Updated vocabulary %s', $title) + sprintf('Updated vocabulary %s', $vocabulary->getLabel()) ); $this->redirect('index', null, null, ['root' => $taxonomyRoot]); } @@ -381,22 +383,28 @@ public function newTaxonomyAction(NodeInterface $parent) * Create a new taxonomy * * @param NodeInterface $parent - * @param string $title - * @param string $description + * @param array $properties * @return void */ - public function createTaxonomyAction(NodeInterface $parent, $title, $description = '') + public function createTaxonomyAction(NodeInterface $parent, array $properties) { + $taxonomyNodeType = $this->nodeTypeManager->getNodeType($this->taxonomyService->getTaxonomyNodeType()); + $taxomonyProperties = $taxonomyNodeType->getProperties(); + $nodeTemplate = new NodeTemplate(); - $nodeTemplate->setNodeType($this->nodeTypeManager->getNodeType($this->taxonomyService->getTaxonomyNodeType())); - $nodeTemplate->setName(CrUtitlity::renderValidNodeName($title)); - $nodeTemplate->setProperty('title', $title); - $nodeTemplate->setProperty('description', $description); + $nodeTemplate->setNodeType($taxonomyNodeType); + $nodeTemplate->setName(CrUtitlity::renderValidNodeName($properties['title'])); + + foreach($properties as $name => $value) { + if (array_key_exists($name, $taxomonyProperties)) { + $nodeTemplate->setProperty($name, $value); + } + } $taxonomy = $parent->createNodeFromTemplate($nodeTemplate); $this->addFlashMessage( - sprintf('Created taxonomy %s at path %s', $title, $taxonomy->getPath()) + sprintf('Created taxonomy %s at path %s', $taxonomy->getLabel(), $taxonomy->getPath()) ); $flowQuery = new FlowQuery([$taxonomy]); @@ -430,28 +438,25 @@ public function editTaxonomyAction(NodeInterface $taxonomy) $this->view->assign('taxonomy', $taxonomy); $this->view->assign('defaultTaxonomy', $this->getNodeInDefaultDimensions($taxonomy)); - } /** * Apply changes to the given taxonomy * * @param NodeInterface $taxonomy - * @param string $title - * @param string $description + * @param array $properties * @return void */ - public function updateTaxonomyAction(NodeInterface $taxonomy, $title, $description = '') + public function updateTaxonomyAction(NodeInterface $taxonomy, array $properties) { - $previousTitle = $taxonomy->getProperty('title'); - $previousDescription = $taxonomy->getProperty('description'); - - if ($previousTitle !== $title) { - $taxonomy->setProperty('title', $title); - } - - if ($previousDescription !== $description) { - $taxonomy->setProperty('description', $description); + $taxonomyProperties = $taxonomy->getNodeType()->getProperties(); + foreach($properties as $name => $value) { + if (array_key_exists($name, $taxonomyProperties)) { + $previous = $taxonomy->getProperty($name); + if ($previous !== $value) { + $taxonomy->setProperty($name, $value); + } + } } $this->addFlashMessage( diff --git a/Configuration/Views.yaml b/Configuration/Views.yaml new file mode 100644 index 0000000..eada44b --- /dev/null +++ b/Configuration/Views.yaml @@ -0,0 +1,6 @@ +- + requestFilter: 'isPackage("Sitegeist.Taxonomy") && isController("Module")' + viewObjectName: 'Neos\Fusion\View\FusionView' + options: + fusionPathPatterns: + - 'resource://Sitegeist.Taxonomy/Private/Fusion/Backend' diff --git a/Resources/Private/Fusion/Backend/Fragments/LanguageSelector.fusion b/Resources/Private/Fusion/Backend/Fragments/LanguageSelector.fusion new file mode 100644 index 0000000..5e60b1c --- /dev/null +++ b/Resources/Private/Fusion/Backend/Fragments/LanguageSelector.fusion @@ -0,0 +1,32 @@ +prototype(Sitegeist.Taxonomy:Views.Fragments.LanguageSelector) < prototype(Neos.Fusion:Component) { + + targetAction = null + targetProperty = null + contentDimensionOptions = null + contextNode = null + + renderer = afx` + + + + + + + + + {presetName} + + + + + + ` +} diff --git a/Resources/Private/Fusion/Backend/Root.fusion b/Resources/Private/Fusion/Backend/Root.fusion new file mode 100644 index 0000000..61c6471 --- /dev/null +++ b/Resources/Private/Fusion/Backend/Root.fusion @@ -0,0 +1,12 @@ +include: resource://Neos.Fusion/Private/Fusion/Root.fusion +include: resource://Neos.Fusion.Form/Private/Fusion/Root.fusion +include: **/*.fusion + + +Sitegeist.Taxonomy.ModuleController.index = Sitegeist.Taxonomy:Views.Module.Vocabulary.List +Sitegeist.Taxonomy.ModuleController.newVocabulary = Sitegeist.Taxonomy:Views.Module.Vocabulary.New +Sitegeist.Taxonomy.ModuleController.editVocabulary = Sitegeist.Taxonomy:Views.Module.Vocabulary.Edit + +Sitegeist.Taxonomy.ModuleController.vocabulary = Sitegeist.Taxonomy:Views.Module.Taxonomy.List +Sitegeist.Taxonomy.ModuleController.newTaxonomy = Sitegeist.Taxonomy:Views.Module.Taxonomy.New +Sitegeist.Taxonomy.ModuleController.editTaxonomy = Sitegeist.Taxonomy:Views.Module.Taxonomy.Edit diff --git a/Resources/Private/Fusion/Backend/Views/Taxonomy.Edit.fusion b/Resources/Private/Fusion/Backend/Views/Taxonomy.Edit.fusion new file mode 100644 index 0000000..13f7253 --- /dev/null +++ b/Resources/Private/Fusion/Backend/Views/Taxonomy.Edit.fusion @@ -0,0 +1,45 @@ +prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.Edit) < prototype(Neos.Fusion:Component) { + + i18nMain = ${Translation.value('').package("Sitegeist.Taxonomy").source('Main')} + i18nVocabulary = ${Translation.value('').package("Sitegeist.Taxonomy").source('NodeTypes/Vocabulary')} + i18nTaxonomy = ${Translation.value('').package("Sitegeist.Taxonomy").source('NodeTypes/Taxonomy')} + + renderer = afx` + {props.i18nMain.id('taxon')}: {taxonomy.properties.title} + {props.i18nMain.id('generic.default')}: {defaultTaxonomy.properties.title} + + + + +
+
+ + +
+ +
+ + +
+ +
+ + {props.i18nMain.id('generic.cancel')} + + {props.i18nMain.id('generic.save') + ''} +
+
+ + ` + +} diff --git a/Resources/Private/Fusion/Backend/Views/Taxonomy.List.fusion b/Resources/Private/Fusion/Backend/Views/Taxonomy.List.fusion new file mode 100644 index 0000000..dc858b3 --- /dev/null +++ b/Resources/Private/Fusion/Backend/Views/Taxonomy.List.fusion @@ -0,0 +1,155 @@ +prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.List) < prototype(Neos.Fusion:Component) { + + i18n = ${Translation.value('').package("Sitegeist.Taxonomy").source('Main')} + i18nVocabulary = ${Translation.value('').package("Sitegeist.Taxonomy").source('NodeTypes/Vocabulary')} + i18nTaxonomy = ${Translation.value('').package("Sitegeist.Taxonomy").source('NodeTypes/Taxonomy')} + + renderer = afx` +
+ + {props.i18n.id('vocabulary')} {vocabulary.properties.title} + ({defaultVocabulary.properties.title}) +
+ +
+ +
+ +

+ {vocabulary.properties.description} +

+ +

+ {props.i18n.id('vocabulary.empty')} +

+ + + + + + + + + + + + + + +
+ {props.i18nTaxonomy.id('properties.title')} + + {defaultVocabulary ? 'Default' : ''} +
+ +
+ + {props.i18n.id('generic.back')} + + + {props.i18n.id('taxon.create')} + +
+ ` +} + + +prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item) < prototype(Neos.Fusion:Component) { + taxon = null + + renderer = afx` + + + +       + + +   + {props.taxon.node.properties.title} + + + {props.taxon.defaultNode ? props.taxon.defaultNode.properties.title : ''} + + + {props.taxon.node.properties.description} + + +
+ + + + + + + + + + + + + + +
+
+
+
+ +
Do you really want to delete the taxonomy "{taxon.node.properties.title}"? This action cannot be undone.
+
+
+ Cancel + + + +
+
+
+
+
+ + + + + +
+ + + + + + + + ` +} diff --git a/Resources/Private/Fusion/Backend/Views/Taxonomy.New.fusion b/Resources/Private/Fusion/Backend/Views/Taxonomy.New.fusion new file mode 100644 index 0000000..9025fba --- /dev/null +++ b/Resources/Private/Fusion/Backend/Views/Taxonomy.New.fusion @@ -0,0 +1,36 @@ +prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.New) < prototype(Neos.Fusion:Component) { + + i18nMain = ${Translation.value('').package("Sitegeist.Taxonomy").source('Main')} + i18nTaxonomy = ${Translation.value('').package("Sitegeist.Taxonomy").source('NodeTypes/Taxonomy')} + + renderer = afx` + {props.i18nMain.id('taxon.createBelow')} "{parent.properties.title}" + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + {props.i18nMain.id('generic.cancel')} + + {props.i18nMain.id('taxon.create') + ''} +
+
+ + ` +} diff --git a/Resources/Private/Fusion/Backend/Views/Vocabulary.Edit.fusion b/Resources/Private/Fusion/Backend/Views/Vocabulary.Edit.fusion new file mode 100644 index 0000000..9038f12 --- /dev/null +++ b/Resources/Private/Fusion/Backend/Views/Vocabulary.Edit.fusion @@ -0,0 +1,46 @@ +prototype(Sitegeist.Taxonomy:Views.Module.Vocabulary.Edit) < prototype(Neos.Fusion:Component) { + + i18nMain = ${Translation.value('').package("Sitegeist.Taxonomy").source('Main')} + i18nVocabulary = ${Translation.value('').package("Sitegeist.Taxonomy").source('NodeTypes/Vocabulary')} + + renderer = afx` +
+ {props.i18nMain.id('vocabulary')}: {vocabulary.properties.title} + {props.i18nMain.id('generic.default')}: {defaultVocabulary.properties.title} +
+ + + + +
+
+ + +
+ +
+ + +
+ +
+ + {props.i18nMain.id('generic.cancel')} + + {props.i18nMain.id('generic.save') + ''} +
+
+ + ` + +} diff --git a/Resources/Private/Fusion/Backend/Views/Vocabulary.List.fusion b/Resources/Private/Fusion/Backend/Views/Vocabulary.List.fusion new file mode 100644 index 0000000..f16db3c --- /dev/null +++ b/Resources/Private/Fusion/Backend/Views/Vocabulary.List.fusion @@ -0,0 +1,104 @@ +prototype(Sitegeist.Taxonomy:Views.Module.Vocabulary.List) < prototype(Neos.Fusion:Component) { + + i18n = ${Translation.value('').package("Sitegeist.Taxonomy").source('Main')} + + renderer = afx` + +
+ + {props.i18n.id('vocabularies')} +
+ +
+ +
+ +

+ +

+ {props.i18n.id('noVocabularies')} +

+ +
+
+ +
+
+
+ +

+ + {vocabulary.node.properties.title} ({vocabulary.defaultNode.properties.title}) + +

+
+ +
+

{vocabulary.node.properties.description}

+
+ +
+ + + + + + + + + + + + + + + + +
+
+
+
+ +
Do you really want to delete the vocabulary "{vocabulary.node.properties.title}"? This action cannot be undone.
+
+
+ Cancel + + + +
+
+
+
+
+ + + + +
+
+
+ {((iterator.cycle % 4) && (!iterator.isLast)) ? '' : '
'} + +
+
+ +
+ + {Translation.id('vocabulary.create')} + +
+ ` +} diff --git a/Resources/Private/Fusion/Backend/Views/Vocabulary.New.fusion b/Resources/Private/Fusion/Backend/Views/Vocabulary.New.fusion new file mode 100644 index 0000000..1032183 --- /dev/null +++ b/Resources/Private/Fusion/Backend/Views/Vocabulary.New.fusion @@ -0,0 +1,35 @@ +prototype(Sitegeist.Taxonomy:Views.Module.Vocabulary.New) < prototype(Neos.Fusion:Component) { + + i18nMain = ${Translation.value('').package("Sitegeist.Taxonomy").source('Main')} + i18nVocabulary = ${Translation.value('').package("Sitegeist.Taxonomy").source('NodeTypes/Vocabulary')} + + renderer = afx` + {props.i18nMain.id('vocabulary.create')} + + + +
+
+ + +
+ +
+ + +
+ +
+ + {props.i18nMain.id('generic.cancel')} + + {props.i18nMain.id('vocabulary.create') + ''} +
+
+ + ` +} diff --git a/Resources/Private/Layouts/BackendSubModule.html b/Resources/Private/Layouts/BackendSubModule.html deleted file mode 100644 index 26da6d1..0000000 --- a/Resources/Private/Layouts/BackendSubModule.html +++ /dev/null @@ -1,11 +0,0 @@ -
- - -
- -
- - - - -
diff --git a/Resources/Private/Partials/FlashMessages.html b/Resources/Private/Partials/FlashMessages.html deleted file mode 100644 index 535e571..0000000 --- a/Resources/Private/Partials/FlashMessages.html +++ /dev/null @@ -1,10 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - -
    - -
  • {neos:backend.translate(id: 'flashMessage.{flashMessage.code}', arguments: flashMessage.arguments, value: flashMessage)}
    • -     -
- - \ No newline at end of file diff --git a/Resources/Private/Partials/LanguageSelection.html b/Resources/Private/Partials/LanguageSelection.html deleted file mode 100644 index 6f68381..0000000 --- a/Resources/Private/Partials/LanguageSelection.html +++ /dev/null @@ -1,17 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} -{namespace taxonomy=Sitegeist\Taxonomy\ViewHelpers} - - - - - - - - - - - - - - - diff --git a/Resources/Private/Partials/TaxonRecursive.html b/Resources/Private/Partials/TaxonRecursive.html deleted file mode 100644 index 29de0cf..0000000 --- a/Resources/Private/Partials/TaxonRecursive.html +++ /dev/null @@ -1,76 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - - -       - - - - - - - - - - -   - {taxon.node.properties.title} - - - {taxon.defaultNode.properties.title} - - - {taxon.node.properties.description} - - -
- - - - - - - - - - - - - - - - - -
-
-
-
- -
Do you really want to delete the taxonomy "{taxon.node.properties.title}"? This action cannot be undone.
-
-
- Cancel - - - -
-
-
-
-
- - - - - -
- - - - - - - diff --git a/Resources/Private/Templates/Module/EditTaxonomy.html b/Resources/Private/Templates/Module/EditTaxonomy.html deleted file mode 100644 index 7f94a64..0000000 --- a/Resources/Private/Templates/Module/EditTaxonomy.html +++ /dev/null @@ -1,56 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - - -
-
- {f:translate(id: 'taxon')}: {taxonomy.properties.title} -
- -
- {f:translate(id: 'generic.default')}: {defaultTaxonomy.properties.title} -
- -
- - -
- - - - -
-
-
- -
-
- -
- -
- -
- - - -
-
-
- -
-
- -
- -
- -
- - {f:translate(id: 'generic.cancel')} - - -
- - diff --git a/Resources/Private/Templates/Module/EditVocabulary.html b/Resources/Private/Templates/Module/EditVocabulary.html deleted file mode 100644 index 8d1c1a3..0000000 --- a/Resources/Private/Templates/Module/EditVocabulary.html +++ /dev/null @@ -1,55 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - -
-
- {f:translate(id: 'vocabulary')}: {vocabulary.properties.title} -
- -
- {f:translate(id: 'generic.default')}: {defaultVocabulary.properties.title} -
- -
- - -
- - - - -
-
-
- -
-
- -
- -
- -
- - - -
-
-
- -
-
- -
- -
- -
- - {f:translate(id: 'generic.cancel')} - - -
- - diff --git a/Resources/Private/Templates/Module/Index.html b/Resources/Private/Templates/Module/Index.html deleted file mode 100644 index cd99d81..0000000 --- a/Resources/Private/Templates/Module/Index.html +++ /dev/null @@ -1,109 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - - - -
- - {f:translate(id: 'vocabularies')} -
- -
- -
- -

- - - -
-
- -
-
-
- -

- - {vocabulary.node.properties.title} ({vocabulary.defaultNode.properties.title}) - -

-
- -
-

{vocabulary.node.properties.description}

-
- -
- - - - - - - - - - -
-
-
-
- -
Do you really want to delete the vocabulary "{vocabulary.node.properties.title}"? This action cannot be undone.
-
-
- Cancel - - - -
-
-
-
-
- - - - -
-
-
- - - - -
- - - - - -
-
- - -

- {f:translate(id: 'noVocabularies')} -

- - - - - -
- - - {f:translate(id: 'vocabulary.create')} - - -
- - - - diff --git a/Resources/Private/Templates/Module/NewTaxonomy.html b/Resources/Private/Templates/Module/NewTaxonomy.html deleted file mode 100644 index 52e2e35..0000000 --- a/Resources/Private/Templates/Module/NewTaxonomy.html +++ /dev/null @@ -1,23 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - - -
- {f:translate(id: 'taxon.createBelow')} "{parent.properties.title}" - - -
- - -
-
- - -
- - {f:translate(id: 'generic.cancel')} - -
- - diff --git a/Resources/Private/Templates/Module/NewVocabulary.html b/Resources/Private/Templates/Module/NewVocabulary.html deleted file mode 100644 index b5f2583..0000000 --- a/Resources/Private/Templates/Module/NewVocabulary.html +++ /dev/null @@ -1,23 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - - -
- {f:translate(id: 'vocabulary.create')} - - -
- - -
-
- - -
- - {f:translate(id: 'generic.cancel')} - -
- - diff --git a/Resources/Private/Templates/Module/Vocabulary.html b/Resources/Private/Templates/Module/Vocabulary.html deleted file mode 100644 index 5660b30..0000000 --- a/Resources/Private/Templates/Module/Vocabulary.html +++ /dev/null @@ -1,60 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - -
- - {f:translate(id: 'vocabulary')} {vocabulary.properties.title} - ({defaultVocabulary.properties.title}) -
- -
- -
- -

- {vocabulary.properties.description} -

- - - - - - - - - - - - - - - - -
- {f:translate(id: 'properties.title', source:'NodeTypes/Taxonomy')} - - Default -
- - -

- {f:translate(id: 'vocabulary.empty')} -

- - - - - -
- - {f:translate(id: 'generic.back')} - - - {f:translate(id: 'taxon.create')} - -
- - - - diff --git a/composer.json b/composer.json index c945bdc..ae68451 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,9 @@ "name": "sitegeist/taxonomy", "license": "GPL-3.0+", "require": { - "neos/neos": "^4.3 || ^5.0 || ^7.0 || ^8.0 || dev-master", - "neos/neos-ui": "^4.0 || ^5.0 || ^7.0 || ^8.0 || dev-master", + "neos/neos": "^7.1 || ^8.0 || dev-master", + "neos/neos-ui": "^7.1 || ^8.0 || dev-master", + "neos/fusion-form": ">2.1", "neos/content-repository": "*" }, "autoload": {