Skip to content

[MAINTENANCE] Remove not necessary <f:then> tags #1857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastian-meyer merged 2 commits into from
Mar 3, 2026
Merged

[MAINTENANCE] Remove not necessary <f:then> tags #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4adcc9b
Remove not necessary `<f:then>` tags
beatrycze-volk Feb 24, 2026
6db793b
Merge branch 'main' into f-then
sebastian-meyer Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions Resources/Private/Partials/Calendar/Day.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,25 @@
data-namespace-typo3-fluid="true">

<f:if condition="{day}">
<f:then>
<div class="issues">
<div class="issues">
<f:if condition="{day.issues}">
<f:then>
<h4>{day.dayValue -> f:format.html()}</h4>
</f:then>
<f:else>
{day.dayValue -> f:format.html()}
</f:else>
</f:if>
<div class="dayLinkList">
<f:if condition="{day.issues}">
<f:then>
<h4>{day.dayValue -> f:format.html()}</h4>
</f:then>
<f:else>
{day.dayValue -> f:format.html()}
</f:else>
<ul>
<f:for each="{day.issues}" as="item">
<li>
<f:link.page pageUid="{settings.targetPid}" additionalParams="{'tx_dlf[id]': item.documentId}">{item.text}</f:link.page>
</li>
</f:for>
</ul>
</f:if>
<div class="dayLinkList">
<f:if condition="{day.issues}">
<ul>
<f:for each="{day.issues}" as="item">
<li>
<f:link.page pageUid="{settings.targetPid}" additionalParams="{'tx_dlf[id]': item.documentId}">
{item.text}
</f:link.page>
</li>
</f:for>
</ul>
</f:if>
</div>
</div>
</f:then>
</div>
</f:if>
6 changes: 1 addition & 5 deletions Resources/Private/Partials/Metadata/IiifEntries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
<f:then>
<f:for each="{data.data}" as="subData" iteration="subIterator">
<f:if condition="{subIterator.isFirst}">
<f:then>
<span>
<f:translate key="{key}" />
</span>
</f:then>
<span><f:translate key="{key}" /></span>
</f:if>
<f:variable name="buildUrl" value="{subData.buildUrl}"/>
<f:variable name="entryData" value="{subData}"/>
Expand Down
28 changes: 13 additions & 15 deletions Resources/Private/Partials/Navigation/MeasureBack.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,19 @@
data-namespace-typo3-fluid="true">

<f:if condition="{numMeasures} > 0 && {double} != 1">
<f:then>
<div class="measureBacks">
<span class="prev">
<f:if condition="{currentMeasure} > 1">
<f:then>
<f:variable name="prevMeasure" value="{currentMeasure - 1}" />
<kitodo:link viewData="{viewData}" additionalParams="{'measure':'{currentMeasure - 1}', 'page':'{measurePages.{prevMeasure}}'}"><f:translate key="prevMeasure"/></kitodo:link>
</f:then>
<f:else>
<span title="{f:translate(key: 'prevPage')}"><f:translate key="prevMeasure"/></span>
</f:else>
</f:if>
</span>
</div>
</f:then>
<div class="measureBacks">
<span class="prev">
<f:if condition="{currentMeasure} > 1">
<f:then>
<f:variable name="prevMeasure" value="{currentMeasure - 1}" />
<kitodo:link viewData="{viewData}" additionalParams="{'measure':'{currentMeasure - 1}', 'page':'{measurePages.{prevMeasure}}'}"><f:translate key="prevMeasure"/></kitodo:link>
</f:then>
<f:else>
<span title="{f:translate(key: 'prevPage')}"><f:translate key="prevMeasure"/></span>
</f:else>
</f:if>
</span>
</div>
</f:if>

</html>
42 changes: 20 additions & 22 deletions Resources/Private/Partials/Navigation/MeasureForward.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,26 @@
data-namespace-typo3-fluid="true">

<f:if condition="{numMeasures} > 0 && {double} != 1">
<f:then>
<div class="measureFwds">
<span class="next">
<f:if condition="{currentMeasure} < {numMeasures}">
<f:then>
<f:if condition="{currentMeasure} > 0">
<f:then>
<f:variable name="nextMeasure" value="{currentMeasure + 1}" />
<kitodo:link viewData="{viewData}" additionalParams="{'measure':'{nextMeasure}', 'page':'{measurePages.{nextMeasure}}'}"><f:translate key="nextMeasure"/></kitodo:link>
</f:then>
<f:else>
<kitodo:link viewData="{viewData}" additionalParams="{'measure':'1', 'page':'{measurePages.1}'}"><f:translate key="nextMeasure"/></kitodo:link>
</f:else>
</f:if>
</f:then>
<f:else>
<span title="{f:translate(key: 'nextMeasure')}"><f:translate key="nextMeasure"/></span>
</f:else>
</f:if>
</span>
</div>
</f:then>
<div class="measureFwds">
<span class="next">
<f:if condition="{currentMeasure} < {numMeasures}">
<f:then>
<f:if condition="{currentMeasure} > 0">
<f:then>
<f:variable name="nextMeasure" value="{currentMeasure + 1}" />
<kitodo:link viewData="{viewData}" additionalParams="{'measure':'{nextMeasure}', 'page':'{measurePages.{nextMeasure}}'}"><f:translate key="nextMeasure"/></kitodo:link>
</f:then>
<f:else>
<kitodo:link viewData="{viewData}" additionalParams="{'measure':'1', 'page':'{measurePages.1}'}"><f:translate key="nextMeasure"/></kitodo:link>
</f:else>
</f:if>
</f:then>
<f:else>
<span title="{f:translate(key: 'nextMeasure')}"><f:translate key="nextMeasure"/></span>
</f:else>
</f:if>
</span>
</div>
</f:if>

</html>
12 changes: 4 additions & 8 deletions Resources/Private/Partials/Search/Form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
<f:form.textfield id="tx-dlf-search-query" property="query" value="{lastSearch.query}" />

<f:if condition="{showLogicalPageField}">
<f:then>
<!-- Logical page -->
<label for="tx-dlf-search-logical-page"><f:translate key="search.logicalPage"/>: </label>
<f:form.textfield class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" name="logicalPage" />
</f:then>
<!-- Logical page -->
<label for="tx-dlf-search-logical-page"><f:translate key="search.logicalPage"/>: </label>
<f:form.textfield class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" name="logicalPage" />
</f:if>

<f:comment><!-- The following element is needed for auto-completion! --></f:comment>
Expand Down Expand Up @@ -68,9 +66,7 @@

<f:comment><!-- Add current collection(s) if using on collection single view or collections-search --></f:comment>
<f:if condition="{lastSearch.collection}">
<f:then>
<f:form.hidden property="collection" value="{lastSearch.collection}" />
</f:then>
<f:form.hidden property="collection" value="{lastSearch.collection}" />
</f:if>

<f:if condition="{extendedSlotCount}">
Expand Down
12 changes: 5 additions & 7 deletions Resources/Private/Partials/Toolbox/ImageDownloadTool.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,11 @@
<f:translate key="downloadLeftPage" /> {imageDownload.0.mimetypeLabel}
</f:link.external>
<f:if condition="{imageDownload.1}">
<f:then>
<span class="tx-dlf-tools-imagedownload">
<f:link.external uri="{imageDownload.1.url}">
<f:translate key="downloadRightPage" /> {imageDownload.1.mimetypeLabel}
</f:link.external>
</span>
</f:then>
<span class="tx-dlf-tools-imagedownload">
<f:link.external uri="{imageDownload.1.url}">
<f:translate key="downloadRightPage" /> {imageDownload.1.mimetypeLabel}
</f:link.external>
</span>
</f:if>
</f:else>
</f:if>
Expand Down
16 changes: 6 additions & 10 deletions Resources/Private/Templates/Basket/Main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@
{entry.BASKETDATA.title}
</f:link.typolink>
<f:if condition="{entry.BASKETDATA.info}">
<f:then>
({entry.BASKETDATA.info})
</f:then>
({entry.BASKETDATA.info})
</f:if>
</dt>
<dd>
Expand Down Expand Up @@ -78,13 +76,11 @@
</f:format.raw>

<f:if condition="{settings.basketGoToButton}">
<f:then>
<div class="tx-dlf-goto-basket">
<f:link.page pageUid="{settings.targetBasket}">
<f:translate key="basket.goBasket"/>
</f:link.page>
</div>
</f:then>
<div class="tx-dlf-goto-basket">
<f:link.page pageUid="{settings.targetBasket}">
<f:translate key="basket.goBasket"/>
</f:link.page>
</div>
</f:if>

</html>
6 changes: 1 addition & 5 deletions Resources/Private/Templates/Calendar/Calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@

<f:for each="{calendarData}" as="month">
<f:if condition="{month.CALYEAR}">
<f:then>
<div class="year">
{month.CALYEAR}
</div>
</f:then>
<div class="year">{month.CALYEAR}</div>
</f:if>
<div class="month">
<table>
Expand Down
102 changes: 48 additions & 54 deletions Resources/Private/Templates/OaiPmh/Main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,38 @@

<f:section name="ListIdentifiers">
<f:if condition="{listIdentifiers -> f:count()} >= 1 ">
<f:then>
<ListIdentifiers>
<f:for each="{listIdentifiers}" as="record">
<ListIdentifiers>
<f:for each="{listIdentifiers}" as="record">
<f:if condition="{record.deleted} || {record.hidden}">
<f:then>
<header status="deleted">
<identifier>{record.record_id}</identifier>
<datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
</header>
</f:then>
<f:else>
<header>
<identifier>{record.record_id}</identifier>
<datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
<f:for each="{record.collections}" as="collection">
<f:if condition="{collection}">
<setSpec>{collection}</setSpec>
</f:if>
</f:for>
</header>
</f:else>
</f:if>
</f:for>
<f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
</ListIdentifiers>
</f:if>
</f:section>

<f:section name="ListRecords">
<f:if condition="{listRecords -> f:count()} >= 1 ">
<ListRecords>
<f:for each="{listRecords}" as="record">
<record>
<f:if condition="{record.deleted} || {record.hidden}">
<f:then>
<header status="deleted">
Expand All @@ -127,64 +156,29 @@
</f:if>
</f:for>
</header>
<metadata>
<f:render section="recordMetadata" arguments="{record: record, parameters: parameters}" />
</metadata>
</f:else>
</f:if>
</f:for>
<f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
</ListIdentifiers>
</f:then>
</f:if>
</f:section>

<f:section name="ListRecords">
<f:if condition="{listRecords -> f:count()} >= 1 ">
<f:then>
<ListRecords>
<f:for each="{listRecords}" as="record">
<record>
<f:if condition="{record.deleted} || {record.hidden}">
<f:then>
<header status="deleted">
<identifier>{record.record_id}</identifier>
<datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
</header>
</f:then>
<f:else>
<header>
<identifier>{record.record_id}</identifier>
<datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
<f:for each="{record.collections}" as="collection">
<f:if condition="{collection}">
<setSpec>{collection}</setSpec>
</f:if>
</f:for>
</header>
<metadata>
<f:render section="recordMetadata" arguments="{record: record, parameters: parameters}" />
</metadata>
</f:else>
</f:if>
</record>
</f:for>
<f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
</ListRecords>
</f:then>
</record>
</f:for>
<f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
</ListRecords>
</f:if>
</f:section>

<f:section name="ListMetadataFormats">
<f:if condition="{metadataFormats -> f:count()} >= 1 ">
<f:then>
<ListMetadataFormats>
<f:for each="{metadataFormats}" as="record">
<metadataFormat>
<metadataPrefix>{record.prefix}</metadataPrefix>
<schema>{record.schema}</schema>
<metadataNamespace>{record.namespace}</metadataNamespace>
</metadataFormat>
</f:for>
</ListMetadataFormats>
</f:then>
<ListMetadataFormats>
<f:for each="{metadataFormats}" as="record">
<metadataFormat>
<metadataPrefix>{record.prefix}</metadataPrefix>
<schema>{record.schema}</schema>
<metadataNamespace>{record.namespace}</metadataNamespace>
</metadataFormat>
</f:for>
</ListMetadataFormats>
</f:if>
</f:section>

Expand Down
28 changes: 11 additions & 17 deletions Resources/Private/Templates/PageView/Main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,20 @@

<f:if condition="{settings.basketButton} && {settings.targetBasket}">
<f:if condition="{settings.basket.crop}">
<f:then>
<div class="tx-dlf-navigation-edit">
<a href="javascript: tx_dlf_viewer.activateSelection();" title="{f:translate(key: 'basket.editMode')}">
<f:translate key="basket.editMode"/>
</a>
</div>
<div class="tx-dlf-navigation-editRemove">
<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="{f:translate(key: 'basket.editRemove')}">
<f:translate key="basket.editRemove"/>
</a>
</div>
</f:then>
<div class="tx-dlf-navigation-edit">
<a href="javascript: tx_dlf_viewer.activateSelection();" title="{f:translate(key: 'basket.editMode')}">
<f:translate key="basket.editMode"/>
</a>
</div>
<div class="tx-dlf-navigation-editRemove">
<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="{f:translate(key: 'basket.editRemove')}">
<f:translate key="basket.editRemove"/>
</a>
</div>
</f:if>
<f:if condition="{settings.basket.magnifier}">
<div class="tx-dlf-navigation-magnifier">
<f:then>
<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="{f:translate(key: 'basket.magnifier')}">
<f:translate key="basket.magnifier"/>
</a>
</f:then>
<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="{f:translate(key: 'basket.magnifier')}"><f:translate key="basket.magnifier"/></a>
</div>
</f:if>

Expand Down
Loading
Loading