Commit 14edb672 authored by Loïc Gouarin's avatar Loïc Gouarin
Browse files

Merge branch 'develop' into 'master'

Job offer filters in toc and add offer as special card

See merge request !207
parents 25d1ff91 215f2934
Pipeline #4437 passed with stages
in 32 seconds
......@@ -8,28 +8,21 @@
</a>
</div>
<h1 class="my-3">Offres d'emploi</h1>
<div class="container text-center py-1">
<div class="row d-flex justify-content-center">
{% for tag, articles in tags | sort %}
{% if tag in JOB_OFFER_TAGS and articles | filter_by_date('expiration_date') | length %}
<div class="col-md-3 px-0">
<a href="{{SITEURL}}/tag/{{tag}}.html">{{JOB_OFFER_TAGS[tag]}}</a>
</div>
{% endif %}
{% endfor %}
</div>
</div>
{% endmacro %}
{% macro toc_content(category) %}
<div class="container-fluid d-flex justify-content-center link pb-3">
<div class="row">
<div class="col-md-auto text-left header-toc">
<a href="{{ SITEURL }}/job_offers/add_job_offer">
<img style="width:22px" src="{{ SITEURL }}/theme/img/ancre.png"/>
AJOUTER UNE OFFRE
</a>
</div>
{% for tag, articles in tags | sort %}
{% if tag in JOB_OFFER_TAGS and articles | filter_by_date('expiration_date') | length %}
<div class="col-md-auto text-left header-toc">
<a href="{{SITEURL}}/tag/{{tag}}.html">
<img style="width:22px" src="{{ SITEURL }}/theme/img/ancre.png"/>
{{JOB_OFFER_TAGS[tag]}}
</a>
</div>
{% endif %}
{% endfor %}
</div>
</div>
{% endmacro %}
......@@ -38,6 +31,22 @@
{% macro content(articles) %}
<div class="container-fluid event">
<div class="row d-flex justify-content-center mx-xl-5 mx-lg-3 event" style="margin-top: 22px;">
<div class="card col-md-4 pt-3 pb-4 px-xl-5 px-md-3 align-self-end">
{% if tag %}
<a href="{{ SITEURL }}/job_offers/add_job_offer?job_type={{tag}}">
{% else %}
<a href="{{ SITEURL }}/job_offers/add_job_offer">
{% endif %}
<div class="card-header"></div>
<div class="card-footer p-0 d-flex align-items-center" id="special">
<div class="container-fluid p-0">
<p class="m-0" style="font-family: 'Playfair Display', serif; font-size:34px; font-weight:500;">
Ajouter une offre
</p>
</div>
</div>
</a>
</div>
{% import 'cards.html' as cards with context %}
{% for article in articles | filter_by_date('expiration_date') %}
{{ cards.dispatch(article) }}
......
......@@ -18,6 +18,10 @@
{{ tag_template.header_content(tag) }}
{% endblock header_content %}
{% block toc_content %}
{{ tag_template.toc_content(tag) }}
{% endblock toc_content %}
{% block content %}
{{ tag_template.content(articles) }}
{% endblock content %}
......
......@@ -8,6 +8,9 @@
</div>
{% endmacro %}
{% macro toc_content(tag) %}
{% endmacro %}
{% macro content(articles) %}
<div class="container-fluid event">
<div class="row d-flex justify-content-center mx-xl-5 mx-lg-3 event" style="margin-top: 22px;">
......
......@@ -8,6 +8,10 @@
{{ category_template.header_content(articles[0].category) }}
{% endmacro %}
{% macro toc_content(tag) %}
{{ category_template.toc_content(articles[0].category) }}
{% endmacro %}
{% macro content(articles) %}
{{ category_template.content(articles) }}
{% endmacro %}
......
......@@ -15,6 +15,9 @@
</div>
{% endmacro %}
{% macro toc_content(tag) %}
{% endmacro %}
{% macro content(articles) %}
<div class="container-fluid event">
<div class="row d-flex justify-content-center mx-xl-5 mx-lg-3 event" style="margin-top: 22px;">
......
......@@ -15,6 +15,9 @@
</div>
{% endmacro %}
{% macro toc_content(tag) %}
{% endmacro %}
{% macro content(articles) %}
<div class="container-fluid event">
<div class="row d-flex justify-content-center mx-xl-5 mx-lg-3 event" style="margin-top: 22px;">
......
Supports Markdown
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