From 6fbbf67281198526336b294a5327ce8dfd2c968e Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Mon, 11 Dec 2017 14:49:48 +0100
Subject: [PATCH] [TASK] Removing stuff from merge conflict
---
.../Private/Templates/Joblist/ApplyForm.html | 4 ---
Resources/Public/JavaScript/sgjobs.js | 30 -------------------
2 files changed, 34 deletions(-)
delete mode 100644 Resources/Public/JavaScript/sgjobs.js
diff --git a/Resources/Private/Templates/Joblist/ApplyForm.html b/Resources/Private/Templates/Joblist/ApplyForm.html
index adcd614f..a597b1bb 100644
--- a/Resources/Private/Templates/Joblist/ApplyForm.html
+++ b/Resources/Private/Templates/Joblist/ApplyForm.html
@@ -5,11 +5,7 @@
<f:form.hidden value="{job.uid}" property="jobId" />
<label for="apply-gender"><f:translate key="frontend.apply.gender" /></label>
-<<<<<<< HEAD
- <f:form.select property="gender" id="apply-gender" data="{}" class="" options="{Male: 'Male', Female: 'Female'}" />
-=======
<f:form.select property="gender" id="apply-gender" class="" options="{None: '', Male: 'Male', Female: 'Female'}" />
->>>>>>> ef0bad6dbd9fd1503cfce001734cb83f277d8404
<f:form.validationResults for="applyData.gender">
<f:for each="{validationResults.errors}" as="error">
<div class="sg-jobs-validation-error">
diff --git a/Resources/Public/JavaScript/sgjobs.js b/Resources/Public/JavaScript/sgjobs.js
deleted file mode 100644
index 97d437c4..00000000
--- a/Resources/Public/JavaScript/sgjobs.js
+++ /dev/null
@@ -1,30 +0,0 @@
-module.exports = function() {
-
- 'use strict';
-
- const $ = require('jquery');
-
- let SgJobs = {};
-
- SgJobs.init = function() {
- $('body').delegate('.sgjobs-select', 'change', function() {
- $.post(
- '?eID=sgAjax&extensionName=SgJobs&controller=Ajax%5CJoblist&action=filter&format=html',
- {
- parameters: {
- country: $('#filter-countries').val(),
- location: $('#filter-locations').val(),
- company: $('#filter-companies').val(),
- area: $('#filter-areas').val(),
- function: $('#filter-functions').val(),
- }
- }
- ).done(function(result) {
- // replace filter & job list with result from ajax controller
- $('#sgjobs-joblist').html(result);
- });
- });
- };
-
- return SgJobs;
-};
--
GitLab