MERGE: Merge branch '5.0' into master

neos · Sep 18, 2019 · b08b569 · b08b569
2 parents 4e7f9e8 + 69e7318
commit b08b569
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/Resources/Private/Content/Sites.xml b/Resources/Private/Content/Sites.xml
@@ -1012,7 +1012,7 @@
           <lastModificationDateTime __type="object" __classname="DateTime">2019-02-25T17:10:06+00:00</lastModificationDateTime>
           <properties>
            <text __type="string">&lt;p&gt;
-                                                &lt;/p&gt;&lt;p&gt;If Neos was a car, &lt;a href=&quot;http://flow.typo3.org&quot;&gt;Flow&lt;/a&gt;
+                                                &lt;/p&gt;&lt;p&gt;If Neos was a car, &lt;a href=&quot;https://flow.neos.io&quot;&gt;Flow&lt;/a&gt;
                                                 were its main engine. It powers many foundational features for building
                                                 extensible and adjustable web applications of today, such as Dependency
                                                 Injection, Aspect-Oriented Programming and a unique
@@ -2667,14 +2667,14 @@
                                         should only be visible to authenticated &quot;Frontend&quot; or &quot;Backend&quot;
                                         users according to the provided Policy.yaml:&lt;/p&gt;&lt;pre&gt;privilegeTargets:
                                         &lt;br/&gt;
-                                        'TYPO3\TYPO3CR\Security\Authorization\Privilege\Node\ReadNodePrivilege':&lt;br/&gt;
+                                        'Neos\ContentRepository\Security\Authorization\Privilege\Node\ReadNodePrivilege':&lt;br/&gt;
                                         'Neos.Demo:MembersArea':&lt;br/&gt; # fee74676-c42f-89da-208e-1741a66525d4 is
                                         the identifier of the &quot;Member area&quot; node.&lt;br/&gt; # You can also
                                         specify the nodepath, but that is not as reliable &lt;br/&gt; matcher:
                                         'isDescendantNodeOf(&quot;fee74676-c42f-89da-208e-1741a66525d4&quot;)'&lt;br/&gt;&lt;br/&gt;roles:&lt;br/&gt;
                                         'Flowpack.Neos.FrontendLogin:User':&lt;br/&gt; privileges:&lt;br/&gt; -&lt;br/&gt;
                                         privilegeTarget: 'Neos.Demo:MembersArea'&lt;br/&gt; permission: GRANT&lt;br/&gt;&lt;br/&gt;
-                                        'TYPO3.Neos:Editor':&lt;br/&gt; privileges:&lt;br/&gt; -&lt;br/&gt;
+                                        'Neos.Neos:Editor':&lt;br/&gt; privileges:&lt;br/&gt; -&lt;br/&gt;
                                         privilegeTarget: 'Neos.Demo:MembersArea'&lt;br/&gt; permission: GRANT&lt;br/&gt;&lt;/pre&gt;&lt;p&gt;If
                                         the session expires or you un-authenticate the current user using the &lt;a
                                         href=&quot;node://b6788725-56c8-4284-400f-fdb990297cfa&quot;

diff --git a/Resources/Private/Fusion/Document/Fragment/Menu/Language.fusion b/Resources/Private/Fusion/Document/Fragment/Menu/Language.fusion
@@ -8,14 +8,21 @@ prototype(Neos.Demo:Document.Fragment.Menu.Language) < prototype(Neos.Fusion:Com
             <div>
                 <Neos.Fusion:Loop items={props.menuItems}>
                     <span @if.isCurrent={item.state == 'current'} class="language-menu-full">{item.label}</span>
-                    <span @if.isCurrent={item.state == 'current'} class="language-menu-short" title="{item.label}">{item.preset.uriSegment}</span>
+                    <span @if.isCurrent={item.state == 'current'} class="language-menu-short" title={item.label}>{Configuration.setting('Neos.ContentRepository.contentDimensions.language.presets.' + item.targetDimensions.language.value + '.uriSegment')}</span>
                 </Neos.Fusion:Loop>
                 <span>▼</span>
             </div>
             <ul>
                 <Neos.Fusion:Loop items={props.menuItems}>
-                    <li>
-                        <Neos.Neos:NodeLink node={item.node}>{item.label}</Neos.Neos:NodeLink>
+                    <li @if.hasNode={item.node}>
+                        <Neos.Neos:NodeLink node={item.node} >
+                            <span class="language-menu-full">{item.label}</span>
+                            <span class="language-menu-short" title={item.label}>{Configuration.setting('Neos.ContentRepository.contentDimensions.language.presets.' + item.targetDimensions.language.value + '.uriSegment')}</span>
+                        </Neos.Neos:NodeLink>
+                    </li>
+                    <li @if.hasNoNode={!item.node}>
+                        <span class="language-menu-full">{item.label}</span>
+                        <span class="language-menu-short" title={item.label}>{Configuration.setting('Neos.ContentRepository.contentDimensions.language.presets.' + item.targetDimensions.language.value + '.uriSegment')}</span>
                     </li>
                 </Neos.Fusion:Loop>
             </ul>

diff --git a/Resources/Private/Fusion/Document/Fragment/Menu/Main.fusion b/Resources/Private/Fusion/Document/Fragment/Menu/Main.fusion
@@ -39,10 +39,10 @@ prototype(Neos.Demo:Document.Fragment.Menu.Main) < prototype(Neos.Fusion:Compone
                         <li class={item.state}>
                             <Neos.Neos:NodeLink node={item.node}>{item.label}</Neos.Neos:NodeLink>
                             <ul
-                                @if.has={item.children && (item.state != 'normal')}
+                                @if.has={item.subItems && (item.state != 'normal')}
                                 class="second-level-sub-navigation nav nav-justified visible-xs"
                             >
-                                <Neos.Fusion:Loop items={item.children} itemName="item">
+                                <Neos.Fusion:Loop items={item.subItems} itemName="item">
                                     <li class={item.state}>
                                         <Neos.Neos:NodeLink node={item.node}>{item.label}</Neos.Neos:NodeLink>
                                     </li>