Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui

This commit is contained in:
Jannat Patel
2024-01-18 14:44:20 +05:30
17 changed files with 55 additions and 24 deletions

View File

@@ -147,7 +147,7 @@
</span>
</div>
<div class="mt-auto mb-2">
<div class="mb-2">
<svg class="icon icon-sm">
<use href="#icon-clock"></use>
</svg>

View File

@@ -17,7 +17,8 @@
<div class="job-cards-parent">
{% for job in jobs %}
<div class="common-card-style job-card">
<span title="{{ job.company_name}}" style="background-image: url( {{ job.company_logo | urlencode }} );"
{% set company_logo = job.company_logo.replace(' ', '%20') %}
<span title="{{ job.company_name}}" style="background-image: url( {{ company_logo }} );"
class="company-logo"></span>
<div class="job-card-info">
<div class="card-heading">{{ _(job.job_title) }}</div>
@@ -37,7 +38,7 @@
<div class="text-muted">{{ frappe.utils.format_date(job.creation, "medium") }}</div>
</div>
</div>
<a class="stretched-link" href="/jobs/{{ job.name }}"></a>
<a class="stretched-link" href="/job-openings/{{ job.name }}"></a>
</div>
{% endfor %}
</div>

View File

@@ -11,7 +11,8 @@
<div class="common-card-style job-detail-card">
<div class="job-detail-header">
<span title="{{ job.company_name}}" style="background-image: url( {{ job.company_logo | urlencode }} );"
{% set company_logo = job.company_logo.replace(' ', '%20') %}
<span title="{{ job.company_name}}" style="background-image: url( {{ company_logo }} );"
class="company-logo"></span>
<div class="job-card-info">
@@ -33,7 +34,7 @@
</div>
</div>
{% set application_link = job.application_link if frappe.session.user != 'Guest' else '/login?redirect-to=/jobs/' + job.name %}
{% set application_link = job.application_link if frappe.session.user != 'Guest' else '/login?redirect-to=/job-openings/' + job.name %}
<div class="job-actions">
<a class="btn btn-primary btn-sm mr-2" href="{{ application_link }}"> {{ _("Apply") }} </a>
<div class="btn btn-default btn-sm mr-2" id="report" data-job="{{ job.name }}"> {{ _("Report") }} </div>
@@ -94,7 +95,7 @@
{% macro BreadCrumb(job) %}
<div class="breadcrumb">
<a class="dark-links" href="/jobs">{{ _("Job Openings") }}</a>
<a class="dark-links" href="/job-openings">{{ _("Job Openings") }}</a>
<img class="ml-1 mr-1" src="/assets/lms/icons/chevron-right.svg">
<span class="breadcrumb-destination">{{ job.job_title }}</span>
</div>

View File

@@ -11,7 +11,7 @@ frappe.ready(() => {
const open_report_dialog = (e) => {
e.preventDefault();
if (frappe.session.user == "Guest") {
window.location.href = `/login?redirect-to=/jobs/${$(
window.location.href = `/login?redirect-to=/job-openings/${$(
e.currentTarget
).data("job")}`;
return;

View File

@@ -5,7 +5,7 @@ def get_context(context):
try:
job = frappe.form_dict["job"]
except KeyError:
frappe.local.flags.redirect_location = "/jobs"
frappe.local.flags.redirect_location = "/job-openings"
raise frappe.Redirect
context.job = frappe.get_doc("Job Opportunity", job)