Skip to content

Commit

Permalink
TASK: Replace TYPO3 by Neos
Browse files Browse the repository at this point in the history
  • Loading branch information
robertlemke committed Jan 27, 2017
1 parent 537470b commit 19b00f4
Show file tree
Hide file tree
Showing 50 changed files with 205 additions and 205 deletions.
42 changes: 21 additions & 21 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
TYPO3.Neos/Resources/Public/JavaScript/ContentModule-built.js merge=ours
TYPO3.Neos/Resources/Public/Styles/Error.css merge=ours
TYPO3.Neos/Resources/Public/Styles/Includes-built.css merge=ours
TYPO3.Neos/Resources/Public/Styles/Login.css merge=ours
TYPO3.Neos/Resources/Public/Styles/Neos.css merge=ours
TYPO3.Neos/Resources/Public/Styles/RawContentMode.css merge=ours
TYPO3.Neos/Documentation/References/CommandReference.rst merge=ours
TYPO3.Neos/Documentation/References/EelHelpersReference.rst merge=ours
TYPO3.Neos/Documentation/References/FlowQueryOperationReference.rst merge=ours
TYPO3.Neos/Documentation/References/Signals/Flow.rst merge=ours
TYPO3.Neos/Documentation/References/Signals/Neos.rst merge=ours
TYPO3.Neos/Documentation/References/Signals/TYPO3CR.rst merge=ours
TYPO3.Neos/Documentation/References/Validators/Flow.rst merge=ours
TYPO3.Neos/Documentation/References/Validators/Media.rst merge=ours
TYPO3.Neos/Documentation/References/Validators/Party.rst merge=ours
TYPO3.Neos/Documentation/References/ViewHelpers/Fluid.rst merge=ours
TYPO3.Neos/Documentation/References/ViewHelpers/Form.rst merge=ours
TYPO3.Neos/Documentation/References/ViewHelpers/Media.rst merge=ours
TYPO3.Neos/Documentation/References/ViewHelpers/Neos.rst merge=ours
TYPO3.Neos/Documentation/References/ViewHelpers/TYPO3CR.rst merge=ours
TYPO3.Neos/Documentation/conf.py merge=ours
Neos.Neos/Resources/Public/JavaScript/ContentModule-built.js merge=ours
Neos.Neos/Resources/Public/Styles/Error.css merge=ours
Neos.Neos/Resources/Public/Styles/Includes-built.css merge=ours
Neos.Neos/Resources/Public/Styles/Login.css merge=ours
Neos.Neos/Resources/Public/Styles/Neos.css merge=ours
Neos.Neos/Resources/Public/Styles/RawContentMode.css merge=ours
Neos.Neos/Documentation/References/CommandReference.rst merge=ours
Neos.Neos/Documentation/References/EelHelpersReference.rst merge=ours
Neos.Neos/Documentation/References/FlowQueryOperationReference.rst merge=ours
Neos.Neos/Documentation/References/Signals/Flow.rst merge=ours
Neos.Neos/Documentation/References/Signals/Neos.rst merge=ours
Neos.Neos/Documentation/References/Signals/TYPO3CR.rst merge=ours
Neos.Neos/Documentation/References/Validators/Flow.rst merge=ours
Neos.Neos/Documentation/References/Validators/Media.rst merge=ours
Neos.Neos/Documentation/References/Validators/Party.rst merge=ours
Neos.Neos/Documentation/References/ViewHelpers/Fluid.rst merge=ours
Neos.Neos/Documentation/References/ViewHelpers/Form.rst merge=ours
Neos.Neos/Documentation/References/ViewHelpers/Media.rst merge=ours
Neos.Neos/Documentation/References/ViewHelpers/Neos.rst merge=ours
Neos.Neos/Documentation/References/ViewHelpers/TYPO3CR.rst merge=ours
Neos.Neos/Documentation/conf.py merge=ours
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
*
* Example (node type):
*
* q(node).find('[instanceof Neos.Neos.NodeTypes:Text]')
* q(node).find('[instanceof Neos.NodeTypes:Text]')
*
* Example (multiple node types):
*
* q(node).find('[instanceof Neos.Neos.NodeTypes:Text],[instanceof Neos.Neos.NodeTypes:Image]')
* q(node).find('[instanceof Neos.NodeTypes:Text],[instanceof Neos.NodeTypes:Image]')
*
* Example (node type with filter):
*
* q(node).find('[instanceof Neos.Neos.NodeTypes:Text][text*="Neos"]')
* q(node).find('[instanceof Neos.NodeTypes:Text][text*="Neos"]')
*
*/
class FindOperation extends AbstractOperation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<nodes formatVersion="2.0">
<node identifier="995c9174-ddd6-4d5c-cfc0-1ffc82184677" nodeName="neosdemotypo3org">
<variant sortingIndex="100" workspace="live" nodeType="TYPO3.Neos.NodeTypes:Page" version="14" removed="" hidden="" hiddenInIndex="">
<variant sortingIndex="100" workspace="live" nodeType="Neos.NodeTypes:Page" version="14" removed="" hidden="" hiddenInIndex="">
<dimensions>
<language>en_US</language>
<language>en_UK</language>
Expand All @@ -20,4 +20,4 @@
</properties>
</variant>
</node>
</nodes>
</nodes>
6 changes: 3 additions & 3 deletions Neos.Neos/Classes/Command/SiteCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class SiteCommandController extends CommandController
* This command allows to create a blank site with just a single empty document in the default dimension.
* The name of the site, the packageKey must be specified.
*
* If no ``nodeType`` option is specified the command will use `Neos.Neos.NodeTypes:Page` as fallback. The node type
* If no ``nodeType`` option is specified the command will use `Neos.NodeTypes:Page` as fallback. The node type
* must already exists and have the superType ``Neos.Neos:Document``.
*
* If no ``nodeName` option is specified the command will create a unique node-name from the name of the site.
Expand All @@ -109,12 +109,12 @@ class SiteCommandController extends CommandController
*
* @param string $name The name of the site
* @param string $packageKey The site package
* @param string $nodeType The node type to use for the site node. (Default = Neos.Neos.NodeTypes:Page)
* @param string $nodeType The node type to use for the site node. (Default = Neos.NodeTypes:Page)
* @param string $nodeName The name of the site node. If no nodeName is given it will be determined from the siteName.
* @param boolean $inactive The new site is not activated immediately (default = false).
* @return void
*/
public function createCommand($name, $packageKey, $nodeType = 'Neos.Neos.NodeTypes:Page', $nodeName = null, $inactive = false)
public function createCommand($name, $packageKey, $nodeType = 'Neos.NodeTypes:Page', $nodeName = null, $inactive = false)
{
if ($nodeName === null) {
$nodeName = $this->nodeService->generateUniqueNodeName(SiteService::SITES_ROOT_PATH, $name);
Expand Down
6 changes: 3 additions & 3 deletions Neos.Neos/Classes/Command/WorkspaceCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public function createCommand($workspace, $baseWorkspace = 'live', $title = null
* @param string $workspace Name of the workspace, for example "christmas-campaign"
* @param boolean $force Delete the workspace and all of its contents
* @return void
* @see typo3.neos:workspace:discard
* @see neos.neos:workspace:discard
*/
public function deleteCommand($workspace, $force = false)
{
Expand Down Expand Up @@ -319,7 +319,7 @@ public function rebaseCommand($workspace, $baseWorkspace)
* @param boolean $verbose If enabled, information about individual nodes will be displayed
* @return void
* @deprecated since 1.2
* @see typo3.neos:workspace:publish
* @see neos.neos:workspace:publish
*/
public function publishAllCommand($workspaceName, $verbose = false)
{
Expand All @@ -335,7 +335,7 @@ public function publishAllCommand($workspaceName, $verbose = false)
* @param boolean $verbose If enabled, information about individual nodes will be displayed
* @return void
* @deprecated since 1.2
* @see typo3.neos:workspace:discard
* @see neos.neos:workspace:discard
*/
public function discardAllCommand($workspaceName, $verbose = false)
{
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Configuration/NodeTypes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

# Abstract Document type.
# "Documents" always have a publicly-visible URL.
# The most prominent subclass of Document is "Neos.Neos.NodeTypes:Page", but
# The most prominent subclass of Document is "Neos.NodeTypes:Page", but
# anything page-like (like a blog post) should subclass "Neos.Neos:Document".
'Neos.Neos:Document':
superTypes:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Configuration/Settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ Neos:
presets:
default:
# Allows configuring the baseNodeType used in the node tree. It is a filter, so this also
# works: 'TYPO3.Neos:Document,!Acme.Com:SomeNodeTypeToIgnore'
# works: 'Neos.Neos:Document,!Acme.Com:SomeNodeTypeToIgnore'
baseNodeType: 'Neos.Neos:Document'
structureTree:
# number of levels inside the structure tree which shall be loaded eagerly, at start.
Expand Down
4 changes: 2 additions & 2 deletions Neos.Neos/Documentation/CreatingASite/ContentCache.rst
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ The following patterns of tags will be flushed by Neos:
``NodeType_[My.Package:NodeTypeName]``
Flushes cache entries if any node with the given node type changes. ``[My.Package:NodeTypeName]`` needs to be
replaced by any node type name. Inheritance will be taken into account, so for a changed node of type
``Neos.Neos.NodeTypes:Page`` the tags ``NodeType_Neos.Neos.NodeTypes:Page`` and ``NodeType_Neos.Neos:Document``
``Neos.NodeTypes:Page`` the tags ``NodeType_Neos.NodeTypes:Page`` and ``NodeType_Neos.Neos:Document``
(and some more) will be flushed.

``Node_[Identifier]``
Expand Down Expand Up @@ -237,7 +237,7 @@ The following list of Fusion prototypes is cached by default:

The following list of Fusion prototypes is uncached by default:

* Neos.Neos.NodeTypes:Form
* Neos.NodeTypes:Form
* Neos.Neos:Plugin

.. note::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Querying for nodes of two or more different node types

.. code-block:: text
elements = ${q(node).filter('[instanceof Neos.Neos.NodeTypes:Text],[instanceof Neos.Neos.NodeTypes:TextWithImage]').get()}
elements = ${q(node).filter('[instanceof Neos.NodeTypes:Text],[instanceof Neos.NodeTypes:TextWithImage]').get()}
Fizzle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ them, as they can be useful elements to extend, and Neos depends on some of them
for proper behavior.

There are a few core node types which are needed by Neos; these are shipped in ``Neos.Neos``
directly. All other node types such as Text, Image, ... are shipped inside the ``Neos.Neos.NodeTypes``
directly. All other node types such as Text, Image, ... are shipped inside the ``Neos.NodeTypes``
package.

Neos.Neos:Node
Expand All @@ -84,7 +84,7 @@ and "normal content" such as text, which is rendered inside a page. Nodes which
behave like pages are called *Document Nodes* in Neos. This means they have a unique,
externally visible URL by which they can be rendered.

The standard *page* in Neos is implemented by ``Neos.Neos.NodeTypes:Page`` which directly extends from
The standard *page* in Neos is implemented by ``Neos.NodeTypes:Page`` which directly extends from
``Neos.Neos:Document``.


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ additional constraints for each *auto-created child node*::
'main':
constraints:
nodeTypes:
'Neos.Neos.NodeTypes:Text': true
'Neos.NodeTypes:Text': true
'*': false


Expand All @@ -48,14 +48,14 @@ Examples

Disallow nested Two/Three/FourColumn inside a multi column element::

'Neos.Neos.NodeTypes:Column':
'Neos.NodeTypes:Column':
childNodes:
column0:
constraints: &columnConstraints
nodeTypes:
'Neos.Neos.NodeTypes:TwoColumn': false
'Neos.Neos.NodeTypes:ThreeColumn': false
'Neos.Neos.NodeTypes:FourColumn': false
'Neos.NodeTypes:TwoColumn': false
'Neos.NodeTypes:ThreeColumn': false
'Neos.NodeTypes:FourColumn': false
column1:
constraints: *columnConstraints
column2:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The following options are allowed:
- Recursive copying only happens *inside* this aggregate, and stops at nested aggregates.

The most prominent *aggregate* is `Neos.Neos:Document` and everything which inherits from it, like
`Neos.Neos.NodeTypes:Page`.
`Neos.NodeTypes:Page`.

``superTypes``
An array of parent node types inherited from as keys with a boolean values.::
Expand All @@ -67,8 +67,8 @@ The following options are allowed:
constraints:
nodeTypes:
# ALLOW text, DISALLOW Image
'Neos.Neos.NodeTypes:Text': true
'Neos.Neos.NodeTypes:Image': false
'Neos.NodeTypes:Text': true
'Neos.NodeTypes:Image': false
# DISALLOW as Fallback (for not-explicitely-listed node types)
'*': false

Expand All @@ -84,13 +84,13 @@ The following options are allowed:
constraints:
nodeTypes:
# only allow images in this ContentCollection
'Neos.Neos.NodeTypes:Image': true
'Neos.NodeTypes:Image': true
'*': false

By using ``position``, it is possible to define the order in which child nodes appear in the structure tree.
An example may look like::

'Neos.Neos.NodeTypes:Page':
'Neos.NodeTypes:Page':
childNodes:
'someChild':
type: 'Neos.Neos:ContentCollection'
Expand Down Expand Up @@ -369,7 +369,7 @@ The following options are allowed:

Here is one of the standard Neos node types (slightly shortened)::

'Neos.Neos.NodeTypes:Image':
'Neos.NodeTypes:Image':
superTypes:
'Neos.Neos:Content': true
ui:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ For the example above that would be ``Vendor.Site:NodeTypes.YourContentElementNa
ui:
label: 'Vendor.Site:NodeTypes.YourContentElementName:properties.title'
If you e.g. want to *relabel* an existing node property of a different package (like the ``Neos.Neos.NodeTypes:Page``),
If you e.g. want to *relabel* an existing node property of a different package (like the ``Neos.NodeTypes:Page``),
you always have to specify the full translation key (pointing to your package's XLIFF files then).

Validate Translations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Out of the box the `Menu` is rendered using a simple unsorted list::

Wrapping this into some container (if needed) in a lot of cases provides for enough possibilities
to style the menu using CSS. In case it still is needed, it is possible to change the rendered markup
of `Menu` using Fusion. `Menu` is defined inside the core of Neos together with Neos.Neos.NodeTypes:
of `Menu` using Fusion. `Menu` is defined inside the core of Neos together with Neos.NodeTypes:

*Neos.Neos/Resources/Private/Fusion/Root.fusion*

Expand All @@ -181,9 +181,9 @@ of `Menu` using Fusion. `Menu` is defined inside the core of Neos together with

::

prototype(Neos.Neos.NodeTypes:Menu) < prototype(Neos.Neos:Menu)
prototype(Neos.Neos.NodeTypes:Menu) {
templatePath = 'resource://Neos.Neos.NodeTypes/Private/Templates/FusionObjects/Menu.html'
prototype(Neos.NodeTypes:Menu) < prototype(Neos.Neos:Menu)
prototype(Neos.NodeTypes:Menu) {
templatePath = 'resource://Neos.NodeTypes/Private/Templates/FusionObjects/Menu.html'
entryLevel = ${String.toInteger(q(node).property('startLevel'))}
maximumLevels = ${String.toInteger(q(node).property('maximumLevels'))}
node = ${node}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,15 @@ can contain two texts and two videos.
video1:
type: 'Acme.Demo:YouTube'
text0:
type: 'Neos.Neos.NodeTypes:Text'
type: 'Neos.NodeTypes:Text'
text1:
type: 'Neos.Neos.NodeTypes:Text'
type: 'Neos.NodeTypes:Text'

#. The needed Fusion is created::

prototype(Acme.Demo:VideoGrid) {
videoRenderer = Acme.Demo:YouTube
textRenderer = Neos.Neos.NodeTypes:Text
textRenderer = Neos.NodeTypes:Text

video0 = ${q(node).children('video0').get(0)}
video1 = ${q(node).children('video1').get(0)}
Expand All @@ -231,7 +231,7 @@ can contain two texts and two videos.

Instead of referencing specific content types directly the use of the generic `ContentCollection` content
element allows to insert *arbitrary content* inside other elements. An example can be found in the
`Neos.Neos.NodeTypes:MultiColumn` and `Neos.Neos.NodeTypes:MultiColumnItem` content elements.
`Neos.NodeTypes:MultiColumn` and `Neos.NodeTypes:MultiColumnItem` content elements.

As explained earlier (in `What are the benefits of indirection through Fusion?`_) the major benefit
if using Fusion to decouple the rendering of items this way is flexibility. In the video grid
Expand Down
6 changes: 3 additions & 3 deletions Neos.Neos/Documentation/CreatingASite/Security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Node privileges define what can be restricted in relation to accessing and editi
'Some.Package:SomeIdentifier':
matcher: >-
isDescendantNodeOf("c1e528e2-b495-0622-e71c-f826614ef287")
&& createdNodeIsOfType("Neos.Neos.NodeTypes:Text")
&& createdNodeIsOfType("Neos.NodeTypes:Text")
will actually only affect nodes of that type (and subtypes). All users will still be able to create other node types,
unless you also add a more generic privilege target:
Expand Down Expand Up @@ -215,7 +215,7 @@ Usage example:
'Some.Package:SomeIdentifier':
matcher: >-
isDescendantNodeOf("c1e528e2-b495-0622-e71c-f826614ef287")
&& createdNodeIsOfType("Neos.Neos.NodeTypes:Text")
&& createdNodeIsOfType("Neos.NodeTypes:Text")
This defines a privilege target that intercepts creation of Text nodes in the specified node (and all of its child
nodes).
Expand All @@ -234,7 +234,7 @@ Usage example:
'Some.Package:SomeIdentifier':
matcher: >-
isDescendantNodeOf("c1e528e2-b495-0622-e71c-f826614ef287")
&& nodeIsOfType("Neos.Neos.NodeTypes:Text")
&& nodeIsOfType("Neos.NodeTypes:Text")
This defines a privilege target that intercepts editing of Text nodes on the specified node (and all of its child
nodes).
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/GettingStarted/FeatureList.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ have custom properties and childNodes. The list of available NodeTypes is extens
can be created by extending the existing ones.

Neos already comes with a sophisticated list of ContentElements to cover the basic editing needs without further extension.
The Standard ContentElements hat are implemented as NodeTypes from the Package Neos.Neos.NodeTypes and contain the elements
The Standard ContentElements hat are implemented as NodeTypes from the Package Neos.NodeTypes and contain the elements
Headline, Text, Image, Image with Text, 2- 3- 4-Columns, Download List, Forms and Menu.

The List of ContentElements is easily extensible and the demo site already contains examples for YouTube and Flickr
Expand Down
4 changes: 2 additions & 2 deletions Neos.Neos/Documentation/HowTos/EditableSharedFooter.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ the following configuration in NodeTypes.yaml::

'My.Package:HomePage':
superTypes:
'Neos.Neos.NodeTypes:Page': TRUE
'Neos.NodeTypes:Page': TRUE
ui:
label: 'Homepage'
childNodes:
Expand All @@ -30,7 +30,7 @@ the following configuration in NodeTypes.yaml::
(for example if you manually updated the node type in the database) you might
have to create the missing child nodes using::

./flow node:repair --node-type Neos.Neos.NodeTypes:Page
./flow node:repair --node-type Neos.NodeTypes:Page

Fusion code::

Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/HowTos/ExtendingPages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ properties. Below you will find a simple example for adding a page background im

Yaml (Sites/Vendor.Site/Configuration/NodeTypes.yaml) ::

'Neos.Neos.NodeTypes:Page':
'Neos.NodeTypes:Page':
ui:
inspector:
groups:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ Fusion (Sites/Vendor.Site/Resources/Private/Fusion/NodeTypes/Carousel.fusion)::
}

// Collect the carousels children but only images
carouselItemArray = ${q(node).children('carouselItems').children('[instanceof Neos.Neos.NodeTypes:Image]')}
carouselItemArray = ${q(node).children('carouselItems').children('[instanceof Neos.NodeTypes:Image]')}

// Enhance image prototype when inside the carousel
prototype(Neos.Neos.NodeTypes:Image) {
prototype(Neos.NodeTypes:Image) {
// Render images in the carousel with a special template.
templatePath = 'resource://Vendor.Site/Private/Templates/FusionObjects/CarouselItem.html'

Expand Down
Loading

0 comments on commit 19b00f4

Please sign in to comment.