Skip to content

Commit

Permalink
Merge pull request #5 from egobude/master
Browse files Browse the repository at this point in the history
[FEATURE] Adjustments for Neos 3.*
  • Loading branch information
thueske committed Jul 7, 2017
2 parents 32ff50f + 4cde7f2 commit fb5e0a4
Show file tree
Hide file tree
Showing 36 changed files with 424 additions and 413 deletions.
630 changes: 283 additions & 347 deletions Configuration/NodeTypes.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Configuration/Settings.yaml
@@ -1,4 +1,4 @@
TYPO3:
Neos:
Neos:
nodeTypes:
groups:
Expand All @@ -10,4 +10,4 @@ TYPO3:
label: 'One Page Agency'
position: 3
plugins:
position: 4
position: 4
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -8,10 +8,10 @@ Eine Vorschau des Site-Packages befindet sich unter folgendem [Link](http://onep
Voraussetzungen
-------------

Das Site-Package wurde mit Neos CMS in Version 2.x entwickelt.
Das Site-Package wurde mit Neos CMS in Version 3.x entwickelt.

"require": {
"typo3/neos": "2.*",
"typo3/neos": "3.*",
"typo3/neos-nodetypes": "*"
}

Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Content/Sites.xml

Large diffs are not rendered by default.

@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:Clients) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:Clients) < prototype(Neos.Neos:Content) {
setDark = ${q(node).property('setDark')}
clientImageOne = ${q(node).property('clientImageOne')}
clientImageTwo = ${q(node).property('clientImageTwo')}
Expand Down
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:ContactForm) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:ContactForm) < prototype(Neos.Neos:Content) {
contactName = ${q(node).property('contactName')}
contactValidationName = ${q(node).property('contactValidationName')}
contactMail = ${q(node).property('contactMail')}
Expand Down
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:Footer) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:Footer) < prototype(Neos.Neos:Content) {
twitterUsername = ${q(node).property('twitterUsername')}
facebookUsername = ${q(node).property('facebookUsername')}
instagramUsername = ${q(node).property('instagramUsername')}
Expand Down
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:Header) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:Header) < prototype(Neos.Neos:Content) {
leadIn = ${q(node).property('leadIn')}
heading = ${q(node).property('heading')}
headingButton = ${q(node).property('headingButton')}
Expand Down
@@ -1,5 +1,5 @@
prototype(Mw.OnePageAgencySite:Menu) < prototype(TYPO3.TypoScript:Template) {
prototype(Mw.OnePageAgencySite:Menu) < prototype(Neos.Fusion:Template) {
items = ${q(node).find('[instanceof Mw.OnePageAgencySite:Section][sectionAnchor != ""]')}
templatePath = 'resource://Mw.OnePageAgencySite/Private/Templates/TypoScriptObjects/Menu.html'
templatePath = 'resource://Mw.OnePageAgencySite/Private/Templates/FusionObjects/Menu.html'
sectionTitle = ${q(node).property('sectionTitle')}
}
@@ -1,9 +1,9 @@
prototype(Mw.OnePageAgencySite:Portfolio) {
portfolioContent = TYPO3.Neos:ContentCollection {
portfolioContent = Neos.Neos:ContentCollection {
nodePath = 'portfoliocontent'
}
}
prototype(Mw.OnePageAgencySite:Portfolio) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:Portfolio) < prototype(Neos.Neos:Content) {
portfolioCaption = ${q(node).property('portfolioCaption')}
portfolioText = ${q(node).property('portfolioText')}
portfolioImage = ${q(node).property('portfolioImage')}
Expand Down
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:PortfolioModal) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:PortfolioModal) < prototype(Neos.Neos:Content) {
portfolioModalContent = ${q(node).property('portfolioModalContent')}
portfolioModalHeading = ${q(node).property('portfolioModalHeading')}
portfolioModalSubHeading = ${q(node).property('portfolioModalSubHeading')}
Expand Down
@@ -1,9 +1,9 @@
prototype(Mw.OnePageAgencySite:Section) {
sectionContent = TYPO3.Neos:ContentCollection {
sectionContent = Neos.Neos:ContentCollection {
nodePath = 'sectioncontent'
}
}
prototype(Mw.OnePageAgencySite:Section) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:Section) < prototype(Neos.Neos:Content) {
setDark = ${q(node).property('setDark')}
sectionAnchor = ${q(node).property('sectionAnchor')}
specialCss = ${q(node).property('specialCss')}
Expand Down
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:SectionHeadline) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:SectionHeadline) < prototype(Neos.Neos:Content) {
sectionHeading = ${q(node).property('sectionHeading')}
sectionSubHeading = ${q(node).property('sectionSubHeading')}
}
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:ServiceBox) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:ServiceBox) < prototype(Neos.Neos:Content) {
fontawesomeIcon = ${q(node).property('fontawesomeIcon')}
serviceHeading = ${q(node).property('serviceHeading')}
serviceText = ${q(node).property('serviceText')}
Expand Down
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:TeamMember) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:TeamMember) < prototype(Neos.Neos:Content) {
twitterUsername = ${q(node).property('twitterUsername')}
facebookUsername = ${q(node).property('facebookUsername')}
instagramUsername = ${q(node).property('instagramUsername')}
Expand Down
3 changes: 3 additions & 0 deletions Resources/Private/Fusion/Prototypes/Text.fusion
@@ -0,0 +1,3 @@
prototype(Mw.OnePageAgencySite:Text) < prototype(Neos.Neos:Content) {
text = ${q(node).property('text')}
}
@@ -1,4 +1,4 @@
prototype(Mw.OnePageAgencySite:Timeline) < prototype(TYPO3.Neos:Content) {
prototype(Mw.OnePageAgencySite:Timeline) < prototype(Neos.Neos:Content) {
timelineAlignment = ${q(node).property('timelineAlignment')}
timelineText = ${q(node).property('timelineText')}
timelineHeading = ${q(node).property('timelineHeading')}
Expand Down
@@ -1,7 +1,7 @@
prototype(Mw.OnePageAgencySite:TimelineList) {
timelineContent = TYPO3.Neos:ContentCollection {
timelineContent = Neos.Neos:ContentCollection {
nodePath = 'timelinecontent'
attributes.class = 'timeline'
}
}
prototype(Mw.OnePageAgencySite:TimelineList) < prototype(TYPO3.Neos:Content)
prototype(Mw.OnePageAgencySite:TimelineList) < prototype(Neos.Neos:Content)
@@ -1,26 +1,26 @@
/**
* Root TypoScript template for the OnePageAgency site
* Root Fusion template for the OnePageAgency site
*/

// Include TypoScript
include: Prototypes/*.ts2
// Include Fusion
include: Prototypes/*.fusion

page = Page {
head {
// Stylesheets
stylesheets.site = TYPO3.TypoScript:Template {
stylesheets.site = Neos.Fusion:Template {
templatePath = 'resource://Mw.OnePageAgencySite/Private/Templates/Page/Default.html'
sectionName = 'stylesheets'
}

// Fonts
stylesheets.fonts = TYPO3.TypoScript:Template {
stylesheets.fonts = Neos.Fusion:Template {
templatePath = 'resource://Mw.OnePageAgencySite/Private/Templates/Page/Default.html'
sectionName = 'fonts'
}

// Head JavaScript
javascripts.site = TYPO3.TypoScript:Template {
javascripts.site = Neos.Fusion:Template {
templatePath = 'resource://Mw.OnePageAgencySite/Private/Templates/Page/Default.html'
sectionName = 'headScripts'
}
Expand All @@ -37,7 +37,7 @@ page = Page {
navbarTitle = ${q(node).property('navbarTitle')}
parts {
// Portfolio Modals
portfolioModals = TYPO3.TypoScript:Collection {
portfolioModals = Neos.Fusion:Collection {
collection = ${q(node).find('[instanceof Mw.OnePageAgencySite:PortfolioModal]')}
itemName = 'node'
itemRenderer = Mw.OnePageAgencySite:PortfolioModal
Expand All @@ -63,7 +63,7 @@ page = Page {
}

// Body JavaScript
javascripts.site = TYPO3.TypoScript:Template {
javascripts.site = Neos.Fusion:Template {
templatePath = 'resource://Mw.OnePageAgencySite/Private/Templates/Page/Default.html'
sectionName = 'bodyScripts'
}
Expand Down
@@ -1,5 +1,5 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace ts=TYPO3\TypoScript\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
{namespace ts=Neos\Fusion\ViewHelpers}
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<f:for each="{items}" as="item">
Expand Down
10 changes: 5 additions & 5 deletions Resources/Private/Templates/NodeTypes/Clients.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<aside class="{f:if(condition: '{setDark}', then: 'clients bg-light-gray', else: 'clients')}">
<div class="container">
<div class="row">
Expand All @@ -7,7 +7,7 @@
<f:if condition="{clientImageOne}">
<f:then>
<img class="img-responsive img-centered"
src="{typo3.media:uri.image(asset: node.properties.clientImageOne, maximumWidth: 200, maximumHeight: 50)}"
src="{neos.media:uri.image(image: node.properties.clientImageOne, maximumWidth: 200, maximumHeight: 50)}"
alt="">
</f:then>
<f:else>
Expand All @@ -22,7 +22,7 @@
<f:if condition="{clientImageTwo}">
<f:then>
<img class="img-responsive img-centered"
src="{typo3.media:uri.image(asset: node.properties.clientImageTwo, maximumWidth: 200, maximumHeight: 50)}"
src="{neos.media:uri.image(image: node.properties.clientImageTwo, maximumWidth: 200, maximumHeight: 50)}"
alt="">
</f:then>
<f:else>
Expand All @@ -37,7 +37,7 @@
<f:if condition="{clientImageThree}">
<f:then>
<img class="img-responsive img-centered"
src="{typo3.media:uri.image(asset: node.properties.clientImageThree, maximumWidth: 200, maximumHeight: 50)}"
src="{neos.media:uri.image(image: node.properties.clientImageThree, maximumWidth: 200, maximumHeight: 50)}"
alt="">
</f:then>
<f:else>
Expand All @@ -52,7 +52,7 @@
<f:if condition="{clientImageFour}">
<f:then>
<img class="img-responsive img-centered"
src="{typo3.media:uri.image(asset: node.properties.clientImageFour, maximumWidth: 200, maximumHeight: 50)}"
src="{neos.media:uri.image(image: node.properties.clientImageFour, maximumWidth: 200, maximumHeight: 50)}"
alt="">
</f:then>
<f:else>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/NodeTypes/ContactForm.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<div class="row">
<div class="col-lg-12">
<form name="sentMessage" id="contactForm" novalidate>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/NodeTypes/Footer.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<footer class="{f:if(condition: '{setDark}', then: 'bg-light-gray')}">
<div class="container">
<div class="row">
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Templates/NodeTypes/Header.html
@@ -1,7 +1,7 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<f:if condition="{headerImage}">
<f:then>
<header style="background-image: url('{typo3.media:uri.image(asset: node.properties.headerImage, maximumWidth: 1900, maximumHeight: 1250)}')">
<header style="background-image: url('{neos.media:uri.image(image: node.properties.headerImage, maximumWidth: 1900, maximumHeight: 1250)}')">
</f:then>
<f:else>
<header style="background-image: url('http://placehold.it/1900x1250?text=+')">
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Templates/NodeTypes/Portfolio.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<div class="col-md-4 col-sm-6 portfolio-item">
<a data-toggle="modal" class="portfolio-link" href="#portfolio-{node.identifier}">
<div class="portfolio-hover">
Expand All @@ -8,7 +8,7 @@
</div>
<f:if condition="{portfolioImage}">
<f:then>
<img src="{typo3.media:uri.image(asset: node.properties.portfolioImage, maximumWidth: 400, maximumHeight: 289)}"
<img src="{neos.media:uri.image(image: node.properties.portfolioImage, maximumWidth: 400, maximumHeight: 289)}"
class="img-responsive" alt="">
</f:then>
<f:else>
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Templates/NodeTypes/PortfolioModal.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<!-- PortfolioModal {portfolioId} -->
<div class="portfolio-modal modal fade" id="portfolio-{portfolioId}" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
Expand All @@ -17,7 +17,7 @@
<f:if condition="{portfolioModalImage}">
<f:then>
<img class="img-responsive img-centered"
src="{typo3.media:uri.image(asset: node.properties.portfolioModalImage, maximumWidth: 600, maximumHeight: 814)}" alt="">
src="{neos.media:uri.image(image: node.properties.portfolioModalImage, maximumWidth: 600, maximumHeight: 814)}" alt="">
</f:then>
<f:else>
<img class="img-responsive img-centered" src="http://placehold.it/600x814" alt="">
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/NodeTypes/Section.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<section id="{sectionAnchor}" class="{f:if(condition: '{setDark}', then: 'bg-light-gray')} {f:if(condition: '{specialCss}', then: '{specialCss}')}">
<div class="container">
{sectionContent -> f:format.raw()}
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/NodeTypes/SectionHeadline.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<div class="row">
<div class="col-lg-12 text-center">
{neos:contentElement.editable(property: 'sectionHeading', tag: 'h2', class: 'section-heading')}
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/NodeTypes/ServiceBox.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<div class="col-md-4 text-center">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Templates/NodeTypes/TeamMember.html
@@ -1,9 +1,9 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<div class="col-sm-4">
<div class="team-member">
<f:if condition="{teamImage}">
<f:then>
<img src="{typo3.media:uri.image(asset: node.properties.teamImage, maximumWidth: 225, maximumHeight: 225)}"
<img src="{neos.media:uri.image(image: node.properties.teamImage, maximumWidth: 225, maximumHeight: 225)}"
class="img-responsive img-circle" alt="">
</f:then>
<f:else>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/NodeTypes/Text.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<div class="col-lg-8 col-lg-offset-2 text-center">
{neos:contentElement.editable(property: 'text', tag: 'p', class: 'large text-muted')}
</div>
6 changes: 3 additions & 3 deletions Resources/Private/Templates/NodeTypes/Timeline.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<f:if condition="{0:'{timelineAlignment}'} == {0:'timelineNormal'}">
<li class="timeline-inverted">
<div class="timeline-image">
Expand All @@ -14,7 +14,7 @@
<f:if condition="{timelineImage}">
<f:then>
<img class="img-circle img-responsive"
src="{typo3.media:uri.image(asset: node.properties.timelineImage, maximumWidth: 200, maximumHeight: 200)}"
src="{neos.media:uri.image(image: node.properties.timelineImage, maximumWidth: 200, maximumHeight: 200)}"
alt="">
</f:then>
<f:else>
Expand All @@ -41,7 +41,7 @@
<f:if condition="{timelineImage}">
<f:then>
<img class="img-circle img-responsive"
src="{typo3.media:uri.image(asset: node.properties.timelineImage, maximumWidth: 200, maximumHeight: 200)}"
src="{neos.media:uri.image(image: node.properties.timelineImage, maximumWidth: 200, maximumHeight: 200)}"
alt="">
</f:then>
<f:else>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/NodeTypes/TimelineList.html
@@ -1,4 +1,4 @@
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<div class="row">
<div class="col-lg-12">
<ul class="timeline">
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Templates/Page/Default.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
{namespace neos=TYPO3\Neos\ViewHelpers}
{namespace ts=TYPO3\TypoScript\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
{namespace ts=Neos\Fusion\ViewHelpers}
<html>
<head>
<title>{node.properties.title}</title>
Expand Down
3 changes: 0 additions & 3 deletions Resources/Private/TypoScript/Prototypes/Text.ts2

This file was deleted.

0 comments on commit fb5e0a4

Please sign in to comment.