New design (and structure)

DistributionPackages/Neos.DocsNeosIo/Classes/FlowQuery/Operations/FilterByReferencesOperation.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Neos\DocsNeosIo\FlowQuery\Operations;
+
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Eel\FlowQuery\FlowQuery;
+use Neos\Eel\FlowQuery\Operations\AbstractOperation;
+use Neos\Eel\FlowQuery\FlowQueryException;
+
+/**
+ * Copyright (c) 2018 Marvin Kuhn
+ */
+class FilterByReferencesOperation extends AbstractOperation
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @var string
+     */
+    static protected $shortName = 'filterByReferences';
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param FlowQuery $flowQuery the FlowQuery object
+     * @param array $arguments the arguments for this operation
+     * @return void
+     * @throws FlowQueryException
+     */
+    public function evaluate(FlowQuery $flowQuery, array $arguments)
+    {
+        if (!is_string($arguments[0])) {
+            throw new FlowQueryException('The first parameter of '.self::$shortName.' should be an string.');
+        }
+        if (!is_array($arguments[1])) {
+            throw new FlowQueryException('The second parameter of '.self::$shortName.' should be an array.');
+        }
+
+        $context = \array_filter($flowQuery->getContext(), $this->getReferenceFilter($arguments[0], $arguments[1]));
+        $flowQuery->setContext($context);
+    }
+
+    /**
+     * this method returns a closure which intersect references on a given property
+     *
+     * @param string $propertyName
+     * @param array $references
+     * @return \Closure
+     */
+    public function getReferenceFilter(string $propertyName, array $references)
+    {
+        return function (NodeInterface $node) use ($propertyName, $references) {
+            $nodeReferences = $node->getProperty($propertyName);
+
+            if ($nodeReferences === null) {
+                return false;
+            }
+            return count(array_intersect($nodeReferences, $references)) > 0;
+        };
+    }
+}

DistributionPackages/Neos.DocsNeosIo/Configuration/Settings.IncludeAssets.yaml

@@ -1,7 +1,6 @@
 
 Carbon:
   IncludeAssets:
-    GoogleFonts: Material+Icons|Work+Sans:300,200,200italic,300italic,400,400italic
     Packages:
       aa_Theme:
         Path:
@@ -16,6 +15,5 @@ Carbon:
           Head:
             - app.css
           Body:
-            - https://code.jquery.com/jquery-3.2.1.min.js
-            - materialize.js
+            - prism.js
             - app.js[data-manual]

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Content/Code.yaml

@@ -32,6 +32,8 @@
                 label: 'YAML'
               fusion:
                 label: 'Fusion'
+              afx:
+                label: 'AFX'
               fluid:
                 label: 'Fluid'
               php:
@@ -62,6 +64,8 @@
                 label: 'Markdown'
               xml:
                 label: 'XML'
+              docker:
+                label: 'Docker'
     code:
       type: string
       defaultValue: 'Enter code here...'

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Content/HTML.yaml

@@ -0,0 +1,23 @@
+'Neos.DocsNeosIo:Content.HTML':
+  superTypes:
+    'Neos.Neos:Content': true
+    'Neos.DocsNeosIo:Mixin.InspectorGeneral': true
+  ui:
+    label: HTML
+    icon: icon-code
+    position: 250
+    inlineEditable: true
+  properties:
+    code:
+      type: string
+      defaultValue: 'Enter code here...'
+      ui:
+        label: 'Edit code'
+        reloadIfChanged: true
+        inspector:
+          group: 'general'
+          editor: 'Neos.Neos/Inspector/Editors/CodeEditor'
+          editorOptions:
+            buttonLabel: 'Edit code'
+      search:
+        fulltextExtractor: '${Indexing.extractInto("code", value)}'

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Content/Notice.yaml

@@ -1,6 +1,7 @@
 'Neos.DocsNeosIo:Content.Notice':
   superTypes:
     'Neos.Neos:Content': true
+    'Neos.Neos:ContentCollection': true
     'Neos.DocsNeosIo:Mixin.Notice': true
   ui:
     label: Notice

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Content/Section.yaml

@@ -13,6 +13,17 @@
   constraints:
     nodeTypes:
       'Neos.DocsNeosIo:Constraint.Content.Restricted': false
+
+  properties:
+    titleLink:
+      type: string
+      ui:
+        label: Headline Link
+        reloadIfChanged: true
+        inspector:
+          group: general
+          position: 100
+          editor: Neos.Neos/Inspector/Editors/LinkEditor
   options:
     template:
       childNodes:

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Content/Tabs.Item.yaml

@@ -14,8 +14,8 @@
   properties:
     title:
       type: string
-      reloadIfChanged: true
       ui:
         label: 'Tab Title'
+        reloadIfChanged: true
         inspector:
-          group: 'general'
+          group: 'general'

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Document/AbstractPage.yaml

@@ -55,3 +55,10 @@
         reloadPageIfChanged: true
         inspector:
           group: visibility
+    mainMenuTitle:
+      type: string
+      ui:
+        label: 'Menu title'
+        reloadPageIfChanged: true
+        inspector:
+          group: document

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Document/Cookbook.yaml

@@ -8,7 +8,7 @@
     label: Tutorial
     help:
       message: 'Task-oriented step-by-step description of a solution, can be opinionated'
-    icon: icon-book-open
+    icon: icon-graduation-cap
     position: 500
   constraints:
     nodeTypes:

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Document/CookbookTag.yaml

@@ -0,0 +1,25 @@
+'Neos.DocsNeosIo:Document.CookbookTag':
+  superTypes:
+    'Neos.DocsNeosIo:Document.AbstractPage': true
+  ui:
+    label: 'Tutorial Tag'
+    help:
+      message: 'Task-oriented step-by-step description of a solution, can be opinionated'
+    icon: icon-book-open
+    position: 500
+  childNodes:
+    main: ~
+  constraints:
+    nodeTypes:
+      'Neos.Neos:Document': false
+      'Neos.DocsNeosIo:Document.Cookbook': true
+  properties:
+    includedTag:
+      type: reference
+      ui:
+        label: 'IncludedTag'
+        reloadIfChanged: true
+        inspector:
+          group: 'document'
+          editorOptions:
+            nodeTypes: ['Neos.DocsNeosIo:Document.Tag']

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Document/CookbooksOverview.yaml

@@ -5,11 +5,13 @@
     label: 'Tutorials Overview'
     help:
       message: 'Task-oriented step-by-step description of a solution, can be opinionated'
-    icon: icon-book-open
+    icon: icon-book
     position: 500
   childNodes:
     main: ~
   constraints:
     nodeTypes:
       'Neos.Neos:Document': false
       'Neos.DocsNeosIo:Document.Cookbook': true
+      'Neos.DocsNeosIo:Document.CookbookTag': true
+      'Neos.Neos:Shortcut': true

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Document/HomePage.yaml

@@ -13,4 +13,18 @@
         label: 'Alternative navigation root'
         reloadIfChanged: true
         inspector:
-          group: 'document'
+          group: 'document'
+    getStartedLink:
+      type: reference
+      ui:
+        label: 'Get started link'
+        reloadIfChanged: true
+        inspector:
+          group: 'document'
+    installLink:
+      type: reference
+      ui:
+        label: 'Install link'
+        reloadIfChanged: true
+        inspector:
+          group: 'document'

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Document/IframePage.yaml

@@ -0,0 +1,25 @@
+'Neos.DocsNeosIo:Document.IframePage':
+  superTypes:
+    'Neos.Neos:Document': true
+  childNodes:
+    main:
+      type: 'Neos.Neos:ContentCollection'
+      constraints:
+        nodeTypes:
+          '*': false
+  ui:
+    label: 'IFrame Page'
+    help:
+      message: 'Embed an iframe as a page'
+    icon: icon-file-o
+    position: 100
+  properties:
+    url:
+      type: string
+      defaultValue: ''
+      ui:
+        label: 'URL'
+        reloadIfChanged: true
+        inspector:
+          group: document
+          position: 'after status'

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Mixin/Icon.yaml

@@ -52,7 +52,7 @@
                 icon: 'fas fa-link'
               'fas fa-external-link-alt':
                 label: 'External Link'
-                icon: 'fas fa-external-link-alt'
+                icon: 'fas fa-external-link-square-alt'
               'fas fa-book':
                 label: 'Documentation'
                 icon: 'fas fa-book'

DistributionPackages/Neos.DocsNeosIo/NodeTypes/Override/Override.Shortcut.yaml

@@ -0,0 +1,33 @@
+'Neos.Neos:Shortcut':
+  properties:
+    status:
+      type: string
+      defaultValue: ''
+      ui:
+        label: 'Menu status flag'
+        reloadPageIfChanged: true
+        inspector:
+          group: 'document'
+          editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor'
+          editorOptions:
+            allowEmpty: true
+            placeholder: 'None'
+            values:
+              'new':
+                label: 'New'
+              'updated':
+                label: 'Updated'
+    hideFromMainMenu:
+      type: boolean
+      ui:
+        label: i18n
+        reloadPageIfChanged: true
+        inspector:
+          group: visibility
+    mainMenuTitle:
+      type: string
+      ui:
+        label: 'Menu title'
+        reloadPageIfChanged: true
+        inspector:
+          group: document

DistributionPackages/Neos.DocsNeosIo/Resources/Private/Fusion/Component/Authors/Authors.fusion

@@ -2,36 +2,13 @@ prototype(Neos.DocsNeosIo:Component.Authors) < prototype(Neos.Neos:ContentCompon
     authors = false
 
     renderer = afx`
-        <div class="authors authors-multiple" @if.hasMultiple={props.authors && Array.length(props.authors) > 1}>
-            <strong><i>Written by</i></strong>
-            <h4>
-                <Neos.Fusion:Collection collection={props.authors} itemName="author" iterationName="iteration" @children="itemRenderer">
-                    {iteration.isFirst ? '' : ', '}
-                    <span itemprop="author" itemscope="" itemtype="https://schema.org/Person"><span itemprop="name">{author.label}</span></span>
-                </Neos.Fusion:Collection>
-            </h4>
-            <div class="row">
-                <Neos.Fusion:Collection collection={props.authors} itemName="author" iterationName="iteration" @children="itemRenderer">
-                    <div class="col s6 m3 profile-image-col">
-                        <div class="image-container">
-                            <img src={author.gravatar} class="profile-image" />
-                        </div>
-                    </div>
-                </Neos.Fusion:Collection>
-            </div>
-        </div>
-        <div class="authors authors-single" @if.hasOne={props.authors && Array.length(props.authors) == 1}>
-            <div class="row hide-on-small-only">
-              <div class="col s12 m3 center-on-small-only profile-image-col">
-                <div class="image-container">
-                  <img src={Array.first(props.authors).gravatar} class="profile-image round" />
-                </div>
-              </div>
-              <div class="col s12 m9">
-                <strong><i>Written by</i></strong>
-                <h4><span itemprop="author" itemscope="" itemtype="https://schema.org/Person"><span itemprop="name">{Array.first(props.authors).label}</span></span></h4>
-              </div>
-            </div>
-        </div>
+        <p @if={props.authors} class={["authors", Array.length(props.authors) == 1 ? "authors-single" : "authors-multiple"]}>
+            <i>Written by</i> <span>
+                <Neos.Fusion:Loop items={props.authors} itemName="author" iterationName="iteration" @children="itemRenderer">
+                    {iteration.index == 0 ? '' : iteration.isLast ? ' & ' :', '}
+                    <strong itemprop="author" itemscope="" itemtype="https://schema.org/Person"><span itemprop="name">{author.label}</span></strong>
+                </Neos.Fusion:Loop>
+            </span>
+        </p>
     `
 }

DistributionPackages/Neos.DocsNeosIo/Resources/Private/Fusion/Component/Badge/Badge.fusion

@@ -0,0 +1,8 @@
+prototype(Neos.DocsNeosIo:Component.Badge) < prototype(Neos.Fusion:Component) {
+
+    itemStatus = null
+
+    renderer = afx`
+        <span class={'badge new status-' + props.itemStatus}>{props.itemStatus}</span>
+    `
+}

DistributionPackages/Neos.DocsNeosIo/Resources/Private/Fusion/Component/Badge/Badge.scss

@@ -0,0 +1,16 @@
+span.badge {
+    font-size: 0.8em;
+    display: inline-block;
+    padding: 0 4px;
+    font-weight: 400;
+    clip-path: polygon(4px 0, 0 4px, 0 100%, calc(100% - 4px) 100%, 100% calc(100% - 4px), 100% 0);
+}
+
+span.badge.new {
+    color: #26224c;
+    background-color: #eceafa;
+}
+
+.sidebar-link-item .badge {
+    margin-left: auto;
+}