Skip to content
Snippets Groups Projects
Commit ad930f03 authored by Eniko Tot's avatar Eniko Tot
Browse files

[BUGFIX] Fix ApplyForm fields, missing fields and outlook more like the old design

parent 9e6bd9d5
No related branches found
No related tags found
1 merge request!50Bootstrap 5 Support
Hide whitespace changes
Inline Side-by-side
Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html
+ 54
− 54
View file @ ad930f03
......@@ -41,9 +41,9 @@
</div>
</div>
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="card shadow mb-4">
<div class="card-header text-bg-light">
<ul class="mb-0">
<div class="card shadow mb-4 text-bg-light">
<div class="card-header pb-0">
<ul>
<li>
<f:format.raw>
<f:translate key="frontend.jobStart" />
......@@ -92,70 +92,63 @@
</li>
</f:if>
</ul>
<hr>
</div>
<div class="card-body">
<h3 class="card-title">
<h3 class="card-title h4">
<f:format.raw>
<f:translate key="frontend.jobApplyNow" />
</f:format.raw>
</h3>
<f:if condition="!{job.hideApplyByPostal}">
<div class="py-4">
<p class="mb-2">
<f:format.raw>
<f:translate key="frontend.job.via.post" />
</f:format.raw>
</p>
<f:if condition="{job.company}">
<p class="mb-2">
{job.company.0.name}
</p>
</f:if>
<p class="pt-4">
<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>
<p class="mb-2">{job.contact.title} {job.contact.firstName} {job.contact.lastName}</p>
{job.contact.title} {job.contact.firstName} {job.contact.lastName}<br>
</f:then>
<f:else>
<p class="mb-2">{job.company.contact.title} {job.company.contact.firstName} {job.company.contact.lastName}</p>
{job.firstCompany.contact.title} {job.firstCompany.contact.firstName} {job.firstCompany.contact.lastName}<br>
</f:else>
</f:if>
<f:if condition="{job.contact} && {job.contact.street}">
<f:then>
<p class="mb-2">{job.contact.street}</p>
{job.contact.street}<br>
<f:if condition="{job.contact.state}">
<p class="mb-2">{job.contact.state}</p>
{job.contact.state}<br>
</f:if>
<p class="mb-2">{job.contact.zip} {job.contact.city}</p>
{job.contact.zip} {job.contact.city}
<f:if condition="{job.contact.country}">
<p class="mb-2">{job.contact.country}</p>
<br>{job.contact.country}
</f:if>
</f:then>
<f:else>
<f:if condition="{job.company.contact} && {job.company.contact.street}">
<f:if condition="{job.firstCompany.contact} && {job.firstCompany.contact.street}">
<f:then>
<p class="mb-2">{job.company.contact.street}</p>
<f:if condition="{job.company.contact.state}">
<p class="mb-2">{job.company.contact.state}</p>
{job.firstCompany.contact.street}<br>
<f:if condition="{job.firstCompany.contact.state}">
{job.firstCompany.contact.state}<br>
</f:if>
<p class="mb-2">{job.company.contact.zip} {job.company.contact.city}</p>
<f:if condition="{job.company.contact.country}">
<p class="mb-2">{job.company.contact.country}</p>
{job.firstCompany.contact.zip} {job.firstCompany.contact.city}
<f:if condition="{job.firstCompany.contact.country}">
<br>{job.firstCompany.contact.country}
</f:if>
</f:then>
<f:else>
<p class="mb-2">{job.company.street}</p>
<f:if condition="{job.company.state}">
<p class="mb-2">{job.company.state}</p>
{job.firstCompany.street}<br>
<f:if condition="{job.firstCompany.state}">
{job.firstCompany.state}<br>
</f:if>
<p class="mb-2">{job.company.zip} {job.company.city}</p>
<f:if condition="{job.company.country}">
<p class="mb-2">{job.company.country}</p>
{job.firstCompany.zip} {job.firstCompany.city}
<f:if condition="{job.firstCompany.country}">
<br>{job.firstCompany.country}
</f:if>
</f:else>
</f:if>
</f:else>
</f:if>
</div>
</p>
</f:if>
<f:if condition="!{job.hideApplyByEmail}">
......@@ -164,22 +157,23 @@
<f:format.raw>
<f:translate key="frontend.job.via.email" />
</f:format.raw>
<br>
<f:format.html parseFuncTSPath="lib.parseFunc">
<a href="mailto:{f:if(condition: '{job.contact}', then: '{job.contact.email}', else: '{job.company.contact.email}')}">
<f:translate key="frontend.emailContact" />
</a>
</f:format.html>
</p>
<f:format.html parseFuncTSPath="lib.parseFunc">
<a href="mailto:{f:if(condition: '{job.contact}', then: '{job.contact.email}', else: '{job.company.contact.email}')}">
<f:translate key="frontend.emailContact" />
</a>
</f:format.html>
</div>
</f:if>
<p class="py-4">
<hr>
</div>
<div class="card-footer text-center pt-0">
<p class="float-start">
<f:format.raw>
<f:translate key="frontend.job.suggestForm" />
</f:format.raw>
</p>
</div>
<div class="card-footer bg-light text-center">
<a href="{f:if(condition: '{job.applyExternalLink}', then: '{job.applyExternalLink}', else: '#apply')}"
class="btn btn-default w-100">
<f:translate key="frontend.applyNow" />
......@@ -199,12 +193,15 @@
<f:if condition="{job.attachment}">
<div class="card shadow mb-4 text-bg-light">
<div class="card-body">
<f:link.typolink target="_blank"
<f:link.typolink target="_blank" class="d-flex align-items-center"
parameter="{job.attachment.0.originalResource.publicUrl}">
<h:renderSvg name="fontawesome/solid/file-pdf" width="18" height="18"
<h:renderSvg name="fontawesome/regular/file-pdf" width="34" height="38"
color="currentColor" createColorAttribute="TRUE" />
<f:translate key="frontend.attachment" extensionName="SgJobs" />
(PDF, {job.attachment.0.originalResource.size -> f:format.bytes()})
<span class="ps-4">
<f:translate key="frontend.attachment" extensionName="SgJobs" />
<br>
(PDF, {job.attachment.0.originalResource.size -> f:format.bytes()})
</span>
</f:link.typolink>
</div>
</div>
......@@ -510,19 +507,19 @@
</f:section>
<f:section name="contactBox">
<div class="card shadow mb-4">
<div class="card-header text-bg-light">
<div class="card shadow mb-4 text-bg-light">
<div class="card-header">
<p class="h4">
<f:translate key="frontend.apply.contact" />
</p>
<p class="py-2 mb-0">
<p class="mb-0">
{contact.title} {contact.firstName} {contact.lastName}
</p>
<f:if condition="{contact.phone}">
<p class="py-2 mb-0">{contact.phone}</p>
<p class="mb-0">{contact.phone}</p>
</f:if>
<f:if condition="{contact.email} && !{hideApplyByEmail}">
<p class="py-2 mb-0">
<p class="mb-0">
<f:comment>
<!-- Spam Protection (lib.parseFunc encodes adresses) -->
</f:comment>
......@@ -538,7 +535,10 @@
alt="{contact.title} {contact.firstName} {contact.lastName}" />
</f:if>
</div>
<div class="card-body">
<div class="card-body pt-0">
<div class="pb-4">
<hr>
</div>
<p class="h4 card-title">
<f:translate key="frontend.apply.recommend" />
</p>
......
Resources/Public/Images/Svg/fontawesome/regular/file-pdf.svg 0 → 100644
+ 1
− 0
View file @ ad930f03
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M64 464l48 0 0 48-48 0c-35.3 0-64-28.7-64-64L0 64C0 28.7 28.7 0 64 0L229.5 0c17 0 33.3 6.7 45.3 18.7l90.5 90.5c12 12 18.7 28.3 18.7 45.3L384 304l-48 0 0-144-80 0c-17.7 0-32-14.3-32-32l0-80L64 48c-8.8 0-16 7.2-16 16l0 384c0 8.8 7.2 16 16 16zM176 352l32 0c30.9 0 56 25.1 56 56s-25.1 56-56 56l-16 0 0 32c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-48 0-80c0-8.8 7.2-16 16-16zm32 80c13.3 0 24-10.7 24-24s-10.7-24-24-24l-16 0 0 48 16 0zm96-80l32 0c26.5 0 48 21.5 48 48l0 64c0 26.5-21.5 48-48 48l-32 0c-8.8 0-16-7.2-16-16l0-128c0-8.8 7.2-16 16-16zm32 128c8.8 0 16-7.2 16-16l0-64c0-8.8-7.2-16-16-16l-16 0 0 96 16 0zm80-112c0-8.8 7.2-16 16-16l48 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-32 0 0 32 32 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-32 0 0 48c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-64 0-64z"/></svg>
\ No newline at end of file
Resources/Public/Images/Svg/fontawesome/solid/file-pdf.svg deleted 100644 → 0
+ 0
− 1
View file @ 9e6bd9d5
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M0 64C0 28.7 28.7 0 64 0L224 0l0 128c0 17.7 14.3 32 32 32l128 0 0 144-208 0c-35.3 0-64 28.7-64 64l0 144-48 0c-35.3 0-64-28.7-64-64L0 64zm384 64l-128 0L256 0 384 128zM176 352l32 0c30.9 0 56 25.1 56 56s-25.1 56-56 56l-16 0 0 32c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-48 0-80c0-8.8 7.2-16 16-16zm32 80c13.3 0 24-10.7 24-24s-10.7-24-24-24l-16 0 0 48 16 0zm96-80l32 0c26.5 0 48 21.5 48 48l0 64c0 26.5-21.5 48-48 48l-32 0c-8.8 0-16-7.2-16-16l0-128c0-8.8 7.2-16 16-16zm32 128c8.8 0 16-7.2 16-16l0-64c0-8.8-7.2-16-16-16l-16 0 0 96 16 0zm80-112c0-8.8 7.2-16 16-16l48 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-32 0 0 32 32 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-32 0 0 48c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-64 0-64z"/></svg>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment