From 07f1b827293f7e432832d9397b3adb3fea747c8a Mon Sep 17 00:00:00 2001 From: Emilie Zawadzki Date: Tue, 21 Mar 2017 15:59:42 +0100 Subject: [PATCH] [Event] : add bool to check if event is full --- .../agenda/event/includes/event_card.html | 78 +++++++++++++++++++ .../agenda/includes/event_metainfo.html | 2 + .../agenda/includes/event_metainfo_line.html | 2 +- .../includes/event_metainfo_slider.html | 12 +-- .../agenda/includes/event_search.html | 2 +- lib/mezzanine-agenda | 2 +- 6 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 app/templates/agenda/event/includes/event_card.html diff --git a/app/templates/agenda/event/includes/event_card.html b/app/templates/agenda/event/includes/event_card.html new file mode 100644 index 00000000..e78cb3dd --- /dev/null +++ b/app/templates/agenda/event/includes/event_card.html @@ -0,0 +1,78 @@ +{% extends "core/inc/generic_card.html" %} +{% load i18n pages_tags mezzanine_tags media_tags organization_tags %} + +{% block metatitle %} + {{ object.title }} +{% endblock %} + +{% block title %} + {{ object.title }} +{% endblock %} + +{% block url %} + {{ object.get_absolute_url }} +{% endblock %} + +{% block image %} + {% with object.images.all|get_type:'card' as images %} + {% if images %} +
+ +
+ {% else %} +
+ {% if object.departments.first %} + {% with object.departments.first as department %} +
+ {% endwith %} + {% else %} +
+ {% endif %} +
+ {% endif %} + {% endwith %} +{% endblock %} + +{% block tags %} +
+ {% if object.departments.first %} + {% with object.departments.first as department %} +
+ {{ department.department.name }} +
+ {% endwith %} + {% endif %} + {% if object.category %} +
+ {{ object.category|truncatechars:15 }} +
+ {% endif %} +
+{% endblock %} + +{% block content %} + {{ object.description|richtext_filters|safe|truncatechars_html:200 }} +{% endblock %} + +{% block subtitle %} + + {% include 'agenda/includes/event_date_line.html' %} + + {% if object.location %} +
{{ object.location }} + {% endif %} +{% endblock %} + +{% block btn %} + {% if object.prices.all.0|floatformat != '0' and object.prices.all|length > 0 %} + {% if not object.is_full %} + {% for price in object.prices.all %} + {% if forloop.first %} +
+ {% trans "Reserve" %} +
+ {% endif %} + {% endfor %} + {% endif %} + {% endif %} +{% endblock %} diff --git a/app/themes/base/templates/agenda/includes/event_metainfo.html b/app/themes/base/templates/agenda/includes/event_metainfo.html index 00f5ae72..dbc7edbc 100644 --- a/app/themes/base/templates/agenda/includes/event_metainfo.html +++ b/app/themes/base/templates/agenda/includes/event_metainfo.html @@ -61,6 +61,7 @@ {{ event.no_price_comments }}

{% endif %} + {% if not event.is_full %}

{% if event.trainings.all|length %} {% with event.links.all as links %} @@ -76,5 +77,6 @@ {% endif %}

+ {% endif %} {% endif %} {% endif %} diff --git a/app/themes/base/templates/agenda/includes/event_metainfo_line.html b/app/themes/base/templates/agenda/includes/event_metainfo_line.html index 39ba95b8..68b0c7a4 100644 --- a/app/themes/base/templates/agenda/includes/event_metainfo_line.html +++ b/app/themes/base/templates/agenda/includes/event_metainfo_line.html @@ -14,7 +14,7 @@ {% if unit_booking %} - {% if event.prices.all and not is_archive %} + {% if event.prices.all and not is_archive and not event.is_full %}

{% if event.trainings.all|length %} {% with event.links.all as links %} diff --git a/app/themes/base/templates/agenda/includes/event_metainfo_slider.html b/app/themes/base/templates/agenda/includes/event_metainfo_slider.html index fe8f1dd1..5100044a 100644 --- a/app/themes/base/templates/agenda/includes/event_metainfo_slider.html +++ b/app/themes/base/templates/agenda/includes/event_metainfo_slider.html @@ -19,11 +19,13 @@ {{ event.location }} {% endif %} -

- - {% trans "Reserve" %} - -
+ {% if not event.is_full %} +
+ + {% trans "Reserve" %} + +
+ {% endif %} diff --git a/app/themes/base/templates/agenda/includes/event_search.html b/app/themes/base/templates/agenda/includes/event_search.html index 45f304d7..d171d335 100644 --- a/app/themes/base/templates/agenda/includes/event_search.html +++ b/app/themes/base/templates/agenda/includes/event_search.html @@ -10,7 +10,7 @@ {% block subtitle %}
{% include 'agenda/includes/event_date_line.html' with object=event %} - {% if event.prices.all.0|floatformat != '0' and event.prices.all|length > 0 and not is_archive %} + {% if event.prices.all.0|floatformat != '0' and event.prices.all|length > 0 and not is_archive and not event.is_full %} {% trans "Reserve" %} diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index fc5d200f..036a5c7e 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit fc5d200fbb5c8ef1a6058a78c8a80ae34658cfa4 +Subproject commit 036a5c7e7bd4f744c1cf36fc332fd3ce3f9c9aa7 -- 2.39.5