Commit a5f84661 authored by Stefan Busemann's avatar Stefan Busemann

Merge branch '603-fix-typoscript-code-style' into 'master'

Resolve "Fix TypoScript code style"

Closes #603

See merge request !555
parents 2de2c977 162e0fdc
......@@ -51,16 +51,20 @@ tx_gridelements {
3 {
title = 2 Column 70/30
description = 2 column gridelement with 70% / 30%
config.rows.1.columns.1.colspan = 7
config.rows.1.columns.2.colspan = 3
config.rows.1.columns {
1.colspan = 7
2.colspan = 3
}
}
4 < .2
4 {
title = 2 Column 30/70
description = 2 column gridelement with 30% / 70%
config.rows.1.columns.1.colspan = 3
config.rows.1.columns.2.colspan = 7
config.rows.1.columns {
1.colspan = 3
2.colspan = 7
}
}
5 < .2
......@@ -157,34 +161,46 @@ tx_gridelements {
8 {
title = 2 Column 2/10
description = 2 column gridelement with 2 / 10
config.rows.1.columns.1.colspan = 2
config.rows.1.columns.2.colspan = 10
config.rows.1.columns {
1.colspan = 2
2.colspan = 10
}
}
9 < .2
9 {
title = 2 Column 10/2
description = 2 column gridelement with 10 / 2
config.rows.1.columns.1.colspan = 10
config.rows.1.columns.2.colspan = 2
config.rows.1.columns {
1.colspan = 10
2.colspan = 2
}
}
10 < .2
10 {
title = 2 Column 3/9
description = 2 column gridelement with 3 / 9
config.colCount = 12
config.rows.1.columns.1.colspan = 3
config.rows.1.columns.2.colspan = 9
config {
colCount = 12
rows.1.columns {
1.colspan = 3
2.colspan = 9
}
}
}
11 < .2
11 {
title = 2 Column 9/3
description = 2 column gridelement with 9 / 3
config.colCount = 12
config.rows.1.columns.1.colspan = 9
config.rows.1.columns.2.colspan = 3
config {
colCount = 12
rows.1.columns {
1.colspan = 9
2.colspan = 3
}
}
}
}
}
......@@ -18,11 +18,16 @@ mod.web_layout.tt_content.preview {
textmedia = EXT:t3olayout/Resources/Private/Preview/TextMedia.html
}
RTE.default.preset = custom
RTE.config.tt_content.bodytext.preset = custom
RTE.config.tx_news_domain_model_news.bodytext.preset = custom
RTE.config.tt_content.bodytext.types.ce_actionbox.preset = nolink
RTE {
default.preset = custom
config {
tx_news_domain_model_news.bodytext.preset = custom
tt_content.bodytext {
preset = custom
types.ce_actionbox.preset = nolink
}
}
}
tx_news.templateLayouts {
#label the self-created "Latest view" for EXT:News
......
......@@ -35,15 +35,18 @@ TCEFORM {
editlock.disabled = 1
sys_language_uid.disabled = 1
layout.disabled = 1
header_layout.altLabels {
0 = default headline (H2)
1 = page title (H1)
3 = headline (H3)
4 = headline (H4)
5 = headline (H5)
header_layout {
altLabels {
0 = default headline (H2)
1 = page title (H1)
3 = headline (H3)
4 = headline (H4)
5 = headline (H5)
}
removeItems = 2
}
header_layout.removeItems = 2
frame_class {
disabled = 1
types {
......
......@@ -18,9 +18,6 @@ mod {
colPos = 0
colspan = 4
}
}
columns {
2 {
name = LLL:EXT:t3olayout/Resources/Private/Language/locallang.xlf:backend_layout.default.column.sidebar
colPos = 20
......
tt_content.ce_casestudylogo =< lib.default
tt_content.ce_casestudylogo {
templateName = CaseStudyLogo
dataProcessing {
10 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
templateName = CaseStudyLogo
dataProcessing {
10 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
10 {
table = tx_casestudy_logo_item
pidInList.field = pid
where {
data = field:uid
intval = 1
wrap = tt_content=|
}
orderBy = sorting
as = slides
dataProcessing {
10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
10 {
table = tx_casestudy_logo_item
pidInList.field = pid
where {
data = field:uid
intval = 1
wrap = tt_content=|
}
references.fieldName = background_media
as = media
}
orderBy = sorting
as = slides
dataProcessing {
10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
10 {
references.fieldName = background_media
as = media
}
20 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
20 {
references.fieldName = logo_media
as = logomedia
}
}
20 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
20 {
references.fieldName = logo_media
as = logomedia
}
}
}
}
}
tt_content.ce_feuser =< lib.default
tt_content.ce_feuser {
templateName = FeUser
dataProcessing {
10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
10 {
references.fieldName = image
as = images
}
}
settings {
maxImgWidth = 1700
templateName = FeUser
dataProcessing {
10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
10 {
references.fieldName = image
as = images
}
}
settings {
maxImgWidth = 1700
}
}
lib.name_of_user = CONTENT
lib.name_of_user{
lib {
name_of_user = CONTENT
name_of_user {
table = fe_users
select {
pidInList = 1
recursive = 99
uidInList.current = 1
selectFields = name,email
pidInList = 1
recursive = 99
uidInList.current = 1
selectFields = name,email
}
renderObj = COA
renderObj {
10 = TEXT
10.field = name
10 = TEXT
10.field = name
}
}
}
lib.email_of_user < lib.name_of_user
lib.email_of_user.renderObj.10.field = email
\ No newline at end of file
email_of_user < lib.name_of_user
email_of_user.renderObj.10.field = email
}
################################################
#### DYNAMIC CONTENT LIB FOR USAGE IN FLUID ####
################################################
#
# EXAMPLE
# ---------------
# <f:cObject typoscriptObjectPath="lib.dynamicContent" data="{pageUid: '{data.uid}', colPos: '0', wrap: '<div class=\"hero\">|</div>'}" />
#
#
# COLUMN NUMBERS
# ---------------
#
# 0 = main
# 1 = left
# 2 = right
# 3 = border
#
#################
lib.dynamicContent = COA
lib.dynamicContent {
5 = LOAD_REGISTER
......@@ -56,8 +42,10 @@ lib.dynamicContent {
orderBy = sorting
where = colPos={register:colPos}
where.insertData = 1
pidInList.data = register:pageUid
pidInList.override.data = register:contentFromPid
pidInList {
data = register:pageUid
override.data = register:contentFromPid
}
}
stdWrap {
......
lib.footercontent1 = CONTENT
lib.footercontent1 {
table = tt_content
select {
orderBy = sorting
where = colPos=82
languageField = sys_language_uid
}
lib {
footercontent1 = CONTENT
footercontent1 {
table = tt_content
select {
orderBy = sorting
where = colPos=82
languageField = sys_language_uid
}
slide = -1
}
slide = -1
}
lib.footercontent2 < lib.footercontent1
lib.footercontent2.select.where = colPos=83
footercontent2 < lib.footercontent1
footercontent2.select.where = colPos=83
lib.footercontent3 < lib.footercontent1
lib.footercontent3.select.where = colPos=84
footercontent3 < lib.footercontent1
footercontent3.select.where = colPos=84
lib.footercontent4 < lib.footercontent1
lib.footercontent4.select.where = colPos=85
footercontent4 < lib.footercontent1
footercontent4.select.where = colPos=85
}
[globalVar = GP:type = 4444]
config {
disableAllHeaderCode = 1
xhtml_cleaning = none
admPanel = 0
debug = 0
disablePrefixComment = 1
metaCharset = utf-8
additionalHeaders.10.header = Content-Type:text/html
absRefPrefix = /
}
config {
disableAllHeaderCode = 1
xhtml_cleaning = none
admPanel = 0
debug = 0
disablePrefixComment = 1
metaCharset = utf-8
additionalHeaders.10.header = Content-Type:text/html
absRefPrefix = /
}
login = PAGE
login {
typeNum = 4444
10 < plugin.tx_felogin_pi1
10 {
templateFile = EXT:t3olayout/Resources/Private/Templates/Felogin/FrontendLogin.html
redirectDisable = 1
wrapContentInBaseClass = 0
login = PAGE
login {
typeNum = 4444
10 < plugin.tx_felogin_pi1
10 {
templateFile = EXT:t3olayout/Resources/Private/Templates/Felogin/FrontendLogin.html
redirectDisable = 1
wrapContentInBaseClass = 0
welcomeHeader_stdWrap.wrap = <h4>|</h4>
successMessage_stdWrap.wrap = <div class="success">|</div>
logoutMessage_stdWrap.wrap = <div class="success">|</div>
errorMessage_stdWrap.wrap = <div class="error">|</div>
welcomeHeader_stdWrap.wrap = <h4>|</h4>
successMessage_stdWrap.wrap = <div class="success">|</div>
logoutMessage_stdWrap.wrap = <div class="success">|</div>
errorMessage_stdWrap.wrap = <div class="error">|</div>
_LOCAL_LANG.default {
ll_welcome_header = Enter your credentials below to sign in
ll_welcome_message =
}
_LOCAL_LANG.default {
ll_welcome_header = Enter your credentials below to sign in
ll_welcome_message =
}
}
}
[global]
......@@ -39,20 +39,21 @@ config {
20.header = Cache-Control: max-age=7200, private, must-revalidate
}
}
[globalVar=GP:L=1]
config{
sys_language_uid = 1
language = de
locale_all = de_DE.UTF-8
htmlTag_langKey = de
}
[globalVar = GP:L=1]
config {
sys_language_uid = 1
language = de
locale_all = de_DE.UTF-8
htmlTag_langKey = de
}
[global]
[globalVar=GP:L=2]
config{
sys_language_uid = 2
language = es
locale_all = es.UTF-8
htmlTag_langKey = es
}
[global]
\ No newline at end of file
[globalVar = GP:L=2]
config {
sys_language_uid = 2
language = es
locale_all = es.UTF-8
htmlTag_langKey = es
}
[global]
......@@ -59,13 +59,14 @@ page {
40 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
40 {
entryLevel = -1
entryLevel.override = -2
entryLevel.override.if {
negate = 1
isTrue.numRows {
table = pages
where = pid=this
entryLevel {
override = -2
override.if {
negate = 1
isTrue.numRows {
table = pages
where = pid=this
}
}
}
......@@ -79,20 +80,26 @@ page {
}
[globalVar = GP:type = 789]
config.disableAllHeaderCode = 1
config.forceTypeValue = 0
config.linkVars = type(0)
menu = PAGE
menu.typeNum = 789
menu.10 = FLUIDTEMPLATE
menu.10.partialRootPath = EXT:t3olayout/Resources/Private/Partials/
menu.10.file = EXT:t3olayout/Resources/Private/Partials/Ajax/Menu.html
menu.10.dataProcessing.10 < page.10.dataProcessing.10
menu.10.dataProcessing.10.special >
menu.10.settings {
showSearchInNav = {$tx_t3olayout.page.showSearchInNav}
showLoginInNav = {$tx_t3olayout.page.showLoginInNav}
searchPageId = {$tx_t3olayout.page.searchid}
loginPageId = {$tx_t3olayout.page.loginid}
config {
disableAllHeaderCode = 1
forceTypeValue = 0
linkVars = type(0)
}
menu = PAGE
menu {
typeNum = 789
10 = FLUIDTEMPLATE
10 {
partialRootPath = EXT:t3olayout/Resources/Private/Partials/
file = EXT:t3olayout/Resources/Private/Partials/Ajax/Menu.html
dataProcessing.10 < page.10.dataProcessing.10
dataProcessing.10.special >
settings {
showSearchInNav = {$tx_t3olayout.page.showSearchInNav}
showLoginInNav = {$tx_t3olayout.page.showLoginInNav}
searchPageId = {$tx_t3olayout.page.searchid}
loginPageId = {$tx_t3olayout.page.loginid}
}
}
}
[global]
......@@ -21,12 +21,14 @@ lib {
plugin.tx_felogin_pi1 {
templateFile = EXT:t3olayout/Resources/Private/Templates/Felogin/FrontendLoginNoAjax.html
wrapContentInBaseClass = 0
stdWrap.wrap (
stdWrap {
wrap (
<section class="container">|
<p><a href="{$tx_t3olayout.page.forgotPasswordURL}" rel="nofollow">Forgot your password?</a></p>
</section>
)
stdWrap.wrap.if.isFalse.data = TSFE:fe_user|user|uid
)
wrap.if.isFalse.data = TSFE:fe_user|user|uid
}
email_from = {$plugin.tx_femanager.settings.adminEmail}
email_fromName = {$plugin.tx_femanager.settings.adminName}
......
......@@ -33,9 +33,11 @@ feedback {
userAgent.data = getIndpEnv:HTTP_USER_AGENT
}
extbase.pluginName = Form
extbase.controllerExtensionName = Formframework
extbase.controllerName = FormFrontend
extbase.controllerActionName = perform
extbase {
pluginName = Form
controllerExtensionName = Formframework
controllerName = FormFrontend
controllerActionName = perform
}
}
}
lib.downloadlinkfooter = TEXT
lib.downloadlinkfooter.value = {$tx_t3olayout.page.downloadlinkfooter}
lib.getmoreinfofooter = TEXT
lib.getmoreinfofooter.value = {$tx_t3olayout.page.getmoreinfofooter}
# Sponsorlogos
lib.sponsorlogos = TEXT
lib.sponsorlogos.value (
<a href="https://sourceforge.net/"><img src="typo3conf/ext/t3olayout/Resources/Public/Images/Template/sourceforge.svg"/></a>
<a href="https://punkt.de"><img src="typo3conf/ext/t3olayout/Resources/Public/Images/Template/punkt_de.svg"/></a>
)
lib {
downloadlinkfooter = TEXT
downloadlinkfooter.value = {$tx_t3olayout.page.downloadlinkfooter}
getmoreinfofooter = TEXT
getmoreinfofooter.value = {$tx_t3olayout.page.getmoreinfofooter}
}
......@@ -4,27 +4,27 @@ plugin.tx_form {
partialRootPaths.10 = EXT:t3olayout/Resources/Private/Templates/Form/Partials/
layoutRootPaths.10 = EXT:t3olayout/Resources/Private/Templates/Form/Layouts/
}
}
module.tx_form {
settings {
yamlConfigurations {
100 = EXT:t3olayout/Configuration/Yaml/Form/Settings.yaml
}
formDefinitionOverrides {
websiteFeedbackForm {
renderables.0.renderables.4 {
defaultValue = TEXT
defaultValue.data = getIndpEnv:TYPO3_REQUEST_URL
}
}
}
}
}
plugin.tx_form {
module.tx_form {
settings {
yamlConfigurations {
100 = EXT:t3olayout/Configuration/Yaml/Form/Settings.yaml
}
formDefinitionOverrides {
websiteFeedbackForm {
renderables.0.renderables.4.defaultValue = TEXT
renderables.0.renderables.4.defaultValue.data = getIndpEnv:TYPO3_REQUEST_URL
}
}
}
}
page.headerData.670 = TEXT
page.headerData.670 {
value (
page {
headerData.670 = TEXT
headerData.670 {
value (
<!-- Google Tag ManagerXYZ --><script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','{$tx_t3olayout.page.google-tagManager-tag}');</script><!-- End Google Tag Manager -->
)
)
if.isTrue = {$tx_t3olayout.page.enableGoogleTagManager}
}
if.isTrue = {$tx_t3olayout.page.enableGoogleTagManager}
}
page.15 = TEXT
page.15 {
value (
15 = TEXT
15 {
value (
<!-- Google Tag ManagerABC (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={$tx_t3olayout.page.google-tagManager-tag}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
)
)
if.isTrue = {$tx_t3olayout.page.enableGoogleTagManager}
if.isTrue = {$tx_t3olayout.page.enableGoogleTagManager}
}
}
# loaded ts after install the ext:gridelements
[userFunc = TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('gridelements')]
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:gridelements/Configuration/TypoScript/setup.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:gridelements/Configuration/TypoScript/setup.ts">
[global]
tt_content.gridelements_pi1 >
tt_content.gridelements_pi1 =< lib.contentElement
tt_content.gridelements_pi1 {
templateName = Generic
variables {
content = COA
content {
10 = USER
10 {
userFunc = GridElementsTeam\Gridelements\Plugin\Gridelements->main
setup {
default < lib.gridelements.defaultGridSetup
}
}
}
}
}
lib.gridelements.defaultGridSetup.cObject =< lib.contentElement
tt_content {
gridelements_pi1 =< lib.contentElement
gridelements_pi1 {
templateName = Generic
variables {
content = COA
content {
10 = USER
10 {
userFunc = GridElementsTeam\Gridelements\Plugin\Gridelements->main
setup {
# Grid Elements
# @see EXT:t3olayout/Configuration/PageTS/Gridelements.tsconfig
......@@ -70,6 +57,8 @@ tt_content {
11 < .1
11.cObject.templateName = TwoColumns_9-3
default < lib.gridelements.defaultGridSetup
}
}
}
......
......@@ -2,7 +2,11 @@ lib.headerLogo = TEXT
lib.headerLogo {
value = <img src="{$tx_t3olayout.headerLogoFile}" alt="{$tx_t3olayout.headerLogoAltText}" title="{$tx_t3olayout.headerLogoTitleText}" />
insertData = 1
stdWrap.typolink.parameter = {$tx_t3olayout.page.home} _top logoLink
stdWrap.typolink.ATagParams = id="headerLogo" title="{$tx_t3olayout.headerLogoTitleText}"
stdWrap.wrap = <div class="logo">|</div>
stdWrap {
typolink {
parameter = {$tx_t3olayout.page.home} _top logoLink
ATagParams = id="headerLogo" title="{$tx_t3olayout.headerLogoTitleText}"
}
wrap = <div class="logo">|</div>
}
}
lib.newsdetaillangmenu = COA
lib.newsdetaillangmenu {
if.isTrue.data = GP:tx_news_pi1|news
10 = HMENU
10 {
wrap = <ul class="detail-language-menu list-unstyled list-inline">|</ul>
special = language
special.value = 0,1,2
special.normalWhenNoLanguage = 0
addQueryString = 1
1 = TMENU
1 {
expAll = 0
wrap = |
NO = 1
NO {
stdWrap.cObject = TEXT
stdWrap.cObject {
value = English || German || Spanish
}
allWrap = <li class="list-inline-item">|</li>
}
ACT < .NO
ACT = 1
ACT {
ATagParams = class="active"
doNotLinkIt = 1
allWrap = <li class="active list-inline-item d-none">|</li>
}
CUR < .ACT
USERDEF1 = 1
USERDEF1 {
doNotLinkIt = 1
stdWrap.cObject = TEXT
stdWrap.cObject.value =
}
lib {
newsdetaillangmenu = COA
newsdetaillangmenu {
if.isTrue.data = GP:tx_news_pi1|news
10 = HMENU
10 {
wrap = <ul class="detail-language-menu list-unstyled list-inline">|</ul>
special = language
special {
value = 0,1,2
normalWhenNoLanguage = 0
}
addQueryString = 1
1 = TMENU
1 {
expAll = 0
wrap = |
NO = 1
NO {
stdWrap.cObject = TEXT
stdWrap.cObject {
value = English || German || Spanish
}