Skip to content

Commit

Permalink
fix section index
Browse files Browse the repository at this point in the history
  • Loading branch information
@o-ba
o-ba committed Apr 12, 2024
1 parent 7f88210 commit f44546b
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 65 deletions.
49 changes: 49 additions & 0 deletions local_packages/psi/Configuration/Sets/Psi/TypoScript/content.typoscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,53 @@ tt_content.menu_subpages.dataProcessing {
}
}

tt_content.menu_section.dataProcessing {
10 = menu
10 {
// Always activate includeNotInMenu for a section menu of the current page
includeNotInMenu.override = 1
includeNotInMenu.override.if.isFalse.field = pages
special = list
special {
value {
field = pages
override {
data = page:uid
if {
isFalse.field = pages
}

// Currrent page uses content of another page
override {
data = page:content_from_pid
if {
isTrue.data = page:content_from_pid
}
}
}
}
}
dataProcessing {
10 = files
10 {
references.fieldName = media
}
20 = database-query
20 {
table = tt_content
pidInList.field = uid
as = content
where = {#sectionIndex} = 1
orderBy = sorting
dataProcessing {
10 = files
10 {
references.fieldName = image
}
}
}
}
}
}


2 changes: 1 addition & 1 deletion local_packages/psi/Resources/Private/Templates/Content/EmployeeList.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:psi="http://typo3.org/ns/Jacuzzi/Psi/ViewHelpers">
<section class="container employee">
<section class="container employee" id="c{data.uid}">
<f:if condition="{psi:fetchFrontendUsers(pid: data.pages) -> f:count() > 0}">
<f:then>
<ul class="row employee__list">
Expand Down
2 changes: 1 addition & 1 deletion local_packages/psi/Resources/Private/Templates/Content/Image.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">

<section class="container image">
<section class="container image" id="c{data.uid}">
<div class="row image__row">
<div class="image__content {f:if(condition: '{data.layout} == 1', then: 'col-12 col-sm-12', else: 'col-10 cl-sm-10 col-md-8')}">
<f:if condition="{data.subheader}">
Expand Down
4 changes: 1 addition & 3 deletions local_packages/psi/Resources/Private/Templates/Content/MenuSection.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{data.header}

<f:if condition="{menu}">
<ul>
<ul id="c{data.uid}">
<f:for each="{menu}" as="page">
<li>
<a href="{page.link}"{f:if(condition: page.target, then: ' target="{page.target}"')}{f:if(condition: page.current, then: ' aria-current="page"')} title="{page.title}">
Expand Down
75 changes: 36 additions & 39 deletions local_packages/psi/Resources/Private/Templates/Content/MenuSubpages.html
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,37 @@
{namespace uzi=Jacuzzi\Psi\ViewHelpers}
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{menu}">
<f:then>
<div class="latestnews-container">
<div class="latestnews-inner">
<ul class="latestnews-wrap">
<f:for as="page" each="{menu}">
<li class="latestnews-single profile__card">
<div class="latestnews-single-header">
<f:if condition="{page.eventdatetime}">
<f:then>
<p><f:format.date format="d.m.Y" date="{page.eventdatetime}"></f:format.date></p>
</f:then>
</f:if>
<f:if condition="{page.location}">
<f:then>
<p>{page.location}</p>
</f:then>
</f:if>
</div>
<h4 class="latestnews-single-title">
{page.title}
</h4>
<f:link.page class="latestnews-single-link" pageUid="{page.uid}">
<f:translate key="news-readmore" extensionName="psi"/>
<svg class="svg-icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
<path d="M640 768c-12.8 0-21.333333-4.266667-29.866667-12.8-17.066667-17.066667-17.066667-42.666667 0-59.733333l213.333333-213.333333c17.066667-17.066667 42.666667-17.066667 59.733333 0s17.066667 42.666667 0 59.733333l-213.333333 213.333333C661.333333 763.733333 652.8 768 640 768z" />
<path d="M853.333333 554.666667c-12.8 0-21.333333-4.266667-29.866667-12.8l-213.333333-213.333333c-17.066667-17.066667-17.066667-42.666667 0-59.733333s42.666667-17.066667 59.733333 0l213.333333 213.333333c17.066667 17.066667 17.066667 42.666667 0 59.733333C874.666667 550.4 866.133333 554.666667 853.333333 554.666667z" />
<path d="M853.333333 554.666667 170.666667 554.666667c-25.6 0-42.666667-17.066667-42.666667-42.666667s17.066667-42.666667 42.666667-42.666667l682.666667 0c25.6 0 42.666667 17.066667 42.666667 42.666667S878.933333 554.666667 853.333333 554.666667z" />
</svg>
</f:link.page>
</li>
</f:for>
</ul>
</div>
<f:if condition="{menu}">
<f:then>
<div class="latestnews-container" id="c{data.uid}">
<div class="latestnews-inner">
<ul class="latestnews-wrap">
<f:for as="page" each="{menu}">
<li class="latestnews-single profile__card">
<div class="latestnews-single-header">
<f:if condition="{page.eventdatetime}">
<f:then>
<p><f:format.date format="d.m.Y" date="{page.eventdatetime}"></f:format.date></p>
</f:then>
</f:if>
<f:if condition="{page.location}">
<f:then>
<p>{page.location}</p>
</f:then>
</f:if>
</div>
<h4 class="latestnews-single-title">
{page.title}
</h4>
<f:link.page class="latestnews-single-link" pageUid="{page.uid}">
<f:translate key="news-readmore" extensionName="psi"/>
<svg class="svg-icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
<path d="M640 768c-12.8 0-21.333333-4.266667-29.866667-12.8-17.066667-17.066667-17.066667-42.666667 0-59.733333l213.333333-213.333333c17.066667-17.066667 42.666667-17.066667 59.733333 0s17.066667 42.666667 0 59.733333l-213.333333 213.333333C661.333333 763.733333 652.8 768 640 768z" />
<path d="M853.333333 554.666667c-12.8 0-21.333333-4.266667-29.866667-12.8l-213.333333-213.333333c-17.066667-17.066667-17.066667-42.666667 0-59.733333s42.666667-17.066667 59.733333 0l213.333333 213.333333c17.066667 17.066667 17.066667 42.666667 0 59.733333C874.666667 550.4 866.133333 554.666667 853.333333 554.666667z" />
<path d="M853.333333 554.666667 170.666667 554.666667c-25.6 0-42.666667-17.066667-42.666667-42.666667s17.066667-42.666667 42.666667-42.666667l682.666667 0c25.6 0 42.666667 17.066667 42.666667 42.666667S878.933333 554.666667 853.333333 554.666667z" />
</svg>
</f:link.page>
</li>
</f:for>
</ul>
</div>
</f:then>
</f:if>
</html>
</div>
</f:then>
</f:if>
36 changes: 17 additions & 19 deletions local_packages/psi/Resources/Private/Templates/Content/PsiDownloads.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="downloads-container">
<div class="downloads-inner">
<ul class="downloads-wrap">
<f:for each="{data.media}" as="file" >
<li class="downloads-single profile__card">
<p class="downloads-date"><f:format.date format="d.m.Y" date="{file.originalFile.properties.creation_date}"></f:format.date></p>
<p class="downloads-filename">{file.title}</p>
<f:link.file file="{file}" target="_blank">
<span class="download-cta"><f:translate key="download-button" extensionName="psi"/></span>
<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd">
<path d="M11 21.883l-6.235-7.527-.765.644 7.521 9 7.479-9-.764-.645-6.236 7.529v-21.884h-1v21.883z"/>
</svg>
</f:link.file>
</li>
</f:for>
</ul>
</div>
<div class="downloads-container" id="c{data.uid}">
<div class="downloads-inner">
<ul class="downloads-wrap">
<f:for each="{data.media}" as="file" >
<li class="downloads-single profile__card">
<p class="downloads-date"><f:format.date format="d.m.Y" date="{file.originalFile.properties.creation_date}"></f:format.date></p>
<p class="downloads-filename">{file.title}</p>
<f:link.file file="{file}" target="_blank">
<span class="download-cta"><f:translate key="download-button" extensionName="psi"/></span>
<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd">
<path d="M11 21.883l-6.235-7.527-.765.644 7.521 9 7.479-9-.764-.645-6.236 7.529v-21.884h-1v21.883z"/>
</svg>
</f:link.file>
</li>
</f:for>
</ul>
</div>
</html>
</div>
2 changes: 1 addition & 1 deletion local_packages/psi/Resources/Private/Templates/Content/Text.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">

<section class="container text">
<section class="container text" id="c{data.uid}">
<div class="row text__row">
<f:if condition="{data.subheader}">
<span
Expand Down
2 changes: 1 addition & 1 deletion local_packages/psi/Resources/Private/Templates/Content/Textpic.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">

<section class="container textpic">
<section class="container textpic" id="c{data.uid}">
<div class="row textpic__row">
<div
class="textpic__image col-12 col-sm-12 col-md-5 {f:if(condition: '{data.layout} == 1', then: 'textpic__image-right')}">
Expand Down

0 comments on commit f44546b

Please sign in to comment.