[BUGFIX] Cleanup, Fix handling of the remote job flag

Resources/Private/Partials/Job.html

@@ -27,7 +27,7 @@
 							</f:if>
 						</li>
 						<li>
-							<f:if condition="{job.location}">
+							<f:if condition="{job.location} && !{job.telecommutePossible}">
 								<f:then>
 									<f:format.raw><f:translate key="frontend.locationLabel"/></f:format.raw>
 									{job.location}

Resources/Private/Templates/Joblist/ApplyForm.html

@@ -51,7 +51,7 @@
 									</f:if>
 								</li>
 								<li>
-									<f:if condition="{job.location}">
+									<f:if condition="{job.location} && !{job.telecommutePossible}">
 										<f:then>
 											<f:format.raw><f:translate key="frontend.locationLabel"/></f:format.raw>
 											{job.location}
@@ -62,7 +62,9 @@
 									</f:if>
 								</li>
 							</ul>
+
 							<hr>
+
 							<h3>
 								<f:format.raw><f:translate key="frontend.jobApplyNow" /></f:format.raw>
 							</h3>
@@ -93,18 +95,9 @@
 								<f:format.raw><f:translate key="frontend.job.suggestForm"/></f:format.raw>
 							</p>
 							<div class="default-content-element sg-cta sg-cta-with-icon">
-								<f:if condition="{job.applyExternalLink}">
-									<f:then>
-										<a href="{job.applyExternalLink}" class="btn btn-warning btn-lg">
-											<f:translate key="frontend.applyNow"/>
-										</a>
-									</f:then>
-									<f:else>
-										<a href="#apply" class="btn btn-warning btn-lg">
-											<f:translate key="frontend.applyNow"/>
-										</a>
-									</f:else>
-								</f:if>
+								<a href="{f:if(condition: '{job.applyExternalLink}', then: '{job.applyExternalLink}', else: '#apply')}" class="btn btn-warning btn-lg">
+									<f:translate key="frontend.applyNow"/>
+								</a>
 							</div>
 						</div>
 						<f:if condition="{job.contact}">