From b5c29cc8edab9f7ad8886ebc78e7b9c2b2a4fa7b Mon Sep 17 00:00:00 2001
From: Kevin Ditscheid <kevin.ditscheid@sgalinski.de>
Date: Tue, 11 Feb 2025 18:06:25 +0100
Subject: [PATCH] [BUGFIX] Cleanup
---
.../Private/Partials/Backend/ButtonBar.html | 3 +-
.../Private/Partials/Backend/Pagination.html | 20 ++++++-------
.../Private/Partials/Backend/SelectRoot.html | 27 +++++++++---------
Resources/Private/Partials/BaseDocHeader.html | 2 +-
.../Private/Partials/Bootstrap5/Job.html | 8 ++----
Resources/Private/Partials/Job.html | 1 -
Resources/Private/Partials/Path.html | 4 +--
.../Bootstrap5/Joblist/ApplyForm.html | 28 +++++--------------
8 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/Resources/Private/Partials/Backend/ButtonBar.html b/Resources/Private/Partials/Backend/ButtonBar.html
index 16ec4561..d54f5ed5 100644
--- a/Resources/Private/Partials/Backend/ButtonBar.html
+++ b/Resources/Private/Partials/Backend/ButtonBar.html
@@ -1,5 +1,4 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true">
+<html data-namespace-typo3-fluid="true" lang="">
<div class="btn-toolbar" role="toolbar" aria-label="">
<f:for each="{buttons}" as="buttonGroup">
<f:if condition="{buttonGroup -> f:count()} > 1">
diff --git a/Resources/Private/Partials/Backend/Pagination.html b/Resources/Private/Partials/Backend/Pagination.html
index 16d4863a..7e3b5927 100644
--- a/Resources/Private/Partials/Backend/Pagination.html
+++ b/Resources/Private/Partials/Backend/Pagination.html
@@ -1,17 +1,17 @@
{namespace core=TYPO3\CMS\Core\ViewHelpers}
{namespace sg=SGalinski\SgJobs\ViewHelpers}
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true" lang="">
+<html data-namespace-typo3-fluid="true" lang="">
<nav class="mb-2 mt-2">
<ul class="pagination">
- <!-- Records Display -->
+ <f:comment><!-- Records Display --></f:comment>
<li class="page-item ps-2 pe-2 pagination-label">
<span>
<f:translate key="backend.job.records" extensionName="sg_jobs"/> {pagination.startItem} - {pagination.endItem}
</span>
</li>
- <!-- First Button -->
+ <f:comment><!-- First Button --></f:comment>
<li class="page-item ps-2 {f:if(condition: pagination.previousPage, then: '', else: 'disabled')}">
<f:if condition="{pagination.previousPage}">
<f:then>
@@ -28,7 +28,7 @@
</f:if>
</li>
- <!-- Previous Button -->
+ <f:comment><!-- Previous Button --></f:comment>
<li class="page-item ps-2 {f:if(condition: pagination.previousPage, then: '', else: 'disabled')}">
<f:if condition="{pagination.previousPage}">
<f:then>
@@ -45,7 +45,7 @@
</f:if>
</li>
- <!-- Go to Page -->
+ <f:comment><!-- Go to Page --></f:comment>
<li class="page-item ps-2">
<form action="" method="POST">
<f:translate key="backend.job.page" extensionName="sg_jobs"/>
@@ -65,7 +65,7 @@
</form>
</li>
- <!-- Next Button -->
+ <f:comment><!-- Next Button --></f:comment>
<li class="page-item ps-2 {f:if(condition: pagination.nextPage, then: '', else: 'disabled')}">
<f:if condition="{pagination.nextPage}">
<f:then>
@@ -82,7 +82,7 @@
</f:if>
</li>
- <!-- Last Button -->
+ <f:comment><!-- Last Button --></f:comment>
<li class="page-item ps-2 {f:if(condition: pagination.nextPage, then: '', else: 'disabled')}">
<f:if condition="{pagination.nextPage}">
<f:then>
@@ -99,7 +99,7 @@
</f:if>
</li>
- <!-- Refresh Button -->
+ <f:comment><!-- Refresh Button --></f:comment>
<li class="page-item ps-2">
<a href="{f:uri.action(action: action, arguments: {currentPage: pagination.currentPage, itemsPerPage: itemsPerPage})}"
>
@@ -107,7 +107,7 @@
</a>
</li>
- <!-- Custom Items Per Page Input Field with Label -->
+ <f:comment><!-- Custom Items Per Page Input Field with Label --></f:comment>
<li class="page-item ps-2 ms-4 ">
<form action="" method="POST" class="d-flex align-items-center">
<label for="itemsPerPageInput" class="me-2 mb-0">
@@ -124,8 +124,6 @@
<input type="hidden" name="page" value="{pagination.currentPage}"/>
</form>
</li>
-
-
</ul>
</nav>
</html>
diff --git a/Resources/Private/Partials/Backend/SelectRoot.html b/Resources/Private/Partials/Backend/SelectRoot.html
index d1c1734e..3418ad85 100644
--- a/Resources/Private/Partials/Backend/SelectRoot.html
+++ b/Resources/Private/Partials/Backend/SelectRoot.html
@@ -1,6 +1,5 @@
{namespace sg=SGalinski\SgJobs\ViewHelpers}
-
<f:if condition="{pages}">
<div class="panel panel-default recordlist">
<div class="panel-heading">
@@ -9,19 +8,19 @@
<div class="table-fit">
<table data-table="pages" class="table table-striped table-hover">
<tbody>
- <f:for each="{pages}" as="page">
- <tr data-uid="{page.uid}">
- <td nowrap="nowrap" class="col-title">
- <f:link.action class="sg-jobs_pageswitch"
- action="index"
- additionalParams="{id: page.uid}"
- additionalAttributes="{data-page: page.uid, data-path: page.path}">
- <core:iconForRecord table="pages" row="{page}"/>
- {page._thePathFull}
- </f:link.action>
- </td>
- </tr>
- </f:for>
+ <f:for each="{pages}" as="page">
+ <tr data-uid="{page.uid}">
+ <td nowrap="nowrap" class="col-title">
+ <f:link.action class="sg-jobs_pageswitch"
+ action="index"
+ additionalParams="{id: page.uid}"
+ additionalAttributes="{data-page: page.uid, data-path: page.path}">
+ <core:iconForRecord table="pages" row="{page}"/>
+ {page._thePathFull}
+ </f:link.action>
+ </td>
+ </tr>
+ </f:for>
</tbody>
</table>
</div>
diff --git a/Resources/Private/Partials/BaseDocHeader.html b/Resources/Private/Partials/BaseDocHeader.html
index 622fa829..c8278bd6 100644
--- a/Resources/Private/Partials/BaseDocHeader.html
+++ b/Resources/Private/Partials/BaseDocHeader.html
@@ -1,4 +1,4 @@
-<!--Extbase Version -->
+<f:comment><!--Extbase Version --></f:comment>
<div class="module-docheader-bar-column-left">
<f:render partial="Backend/ButtonBar" arguments="{buttons:docHeader.buttons.left}"/>
diff --git a/Resources/Private/Partials/Bootstrap5/Job.html b/Resources/Private/Partials/Bootstrap5/Job.html
index e523b938..c3c60601 100644
--- a/Resources/Private/Partials/Bootstrap5/Job.html
+++ b/Resources/Private/Partials/Bootstrap5/Job.html
@@ -10,9 +10,7 @@
<f:if condition="{job.qualification}">
<ul>
<li>
- <f:format.raw>
- <f:translate key="frontend.jobStart" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.jobStart" /></f:format.raw>
<f:if condition="{job.alternativeStartDate}">
<f:then>
{job.alternativeStartDate}
@@ -38,9 +36,7 @@
<f:link.action id="offer-{job.uid}" pageUid="{settings.applyPage}" controller="Joblist" action="applyForm"
pluginName="JobApplication" arguments="{jobId: job.uid}"
class="btn btn-link text-decoration-none stretched-link w-100 text-uppercase fw-bold">
- <f:format.raw>
- <f:translate key="frontend.jobDetailsCta" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.jobDetailsCta" /></f:format.raw>
</f:link.action>
</div>
</div>
diff --git a/Resources/Private/Partials/Job.html b/Resources/Private/Partials/Job.html
index 1dd69361..75ae04fe 100644
--- a/Resources/Private/Partials/Job.html
+++ b/Resources/Private/Partials/Job.html
@@ -11,7 +11,6 @@
<f:if condition="{job.description}">
<f:format.html parseFuncTSPath="lib.parseFunc_RTE">{job.description}</f:format.html>
</f:if>
-
</div>
<f:if condition="{job.qualification}">
<div class="sgjobs-highlight-area">
diff --git a/Resources/Private/Partials/Path.html b/Resources/Private/Partials/Path.html
index 11695636..8af02be1 100644
--- a/Resources/Private/Partials/Path.html
+++ b/Resources/Private/Partials/Path.html
@@ -1,5 +1,5 @@
<span class="typo3-docheader-pagePath">
- <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path"/>: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
- </span>
+ <f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path"/>: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
+</span>
<f:format.raw>{docHeader.metaInformation.recordInformation}</f:format.raw>
diff --git a/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html b/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html
index 4ea85810..95e00abb 100644
--- a/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html
+++ b/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html
@@ -42,9 +42,7 @@
createColorAttribute="TRUE"
class="d-inline-block translate-y-px-1" />
<span class="text-muted">
- <f:format.raw>
- <f:translate key="frontend.jobStart" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.jobStart" /></f:format.raw>
</span>
<f:if condition="{job.alternativeStartDate}">
<f:then>
@@ -81,9 +79,7 @@
<f:if condition="!{job.telecommutePossible}">
<f:then>
<span class="text-muted">
- <f:format.raw>
- <f:translate key="frontend.locationLabel" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.locationLabel" /></f:format.raw>
</span>
<span>
<f:for as="company" each="{job.company}" iteration="companyIterator">
@@ -127,17 +123,13 @@
<div class="card border-top text-bg-light">
<div class="card-header">
<h3 class="card-title h4">
- <f:format.raw>
- <f:translate key="frontend.jobApplyNow" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.jobApplyNow" /></f:format.raw>
</h3>
</div>
<div class="card-body">
<f:if condition="!{job.hideApplyByPostal}">
<p>
- <f:format.raw>
- <f:translate key="frontend.job.via.post" />
- </f:format.raw><br>
+ <f:format.raw><f:translate key="frontend.job.via.post" /></f:format.raw><br>
{job.firstCompany.name}<br>
<f:if condition="{job.contact}">
<f:then>
@@ -187,9 +179,7 @@
</f:if>
<f:if condition="!{job.hideApplyByEmail}">
<p>
- <f:format.raw>
- <f:translate key="frontend.job.via.email" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.job.via.email" /></f:format.raw>
<br>
<f:comment>
<!-- Spam Protection (lib.parseFunc encodes adresses) -->
@@ -204,9 +194,7 @@
</div>
<div class="card-footer card-footer--static-bg text-center text-bg-light">
<p>
- <f:format.raw>
- <f:translate key="frontend.job.suggestForm" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.job.suggestForm" /></f:format.raw>
</p>
<a href="{f:if(condition: '{job.applyExternalLink}', then: '{job.applyExternalLink}', else: '#apply')}" class="btn btn-primary w-100">
<f:translate key="frontend.applyNow" />
@@ -394,9 +382,7 @@
<div class="form-check mb-4">
<f:form.checkbox class="form-check-input" id="privacy-policy" property="privacyPolicy" value="1" additionalAttributes="{required: 'required'}" />
<label class="form-check-label" for="privacy-policy">
- <f:format.raw>
- <f:translate key="frontend.apply.privacyPolicy" arguments="{0: '{f:render(section:\'privacyPolicyCheckboxLink\')}'}" />
- </f:format.raw>
+ <f:format.raw><f:translate key="frontend.apply.privacyPolicy" arguments="{0: '{f:render(section:\'privacyPolicyCheckboxLink\')}'}" /></f:format.raw>
</label>
<f:render section="formValidation" arguments="{form-field: 'privacyPolicy'}" />
</div>
--
GitLab