From: Jérémy Fabre Date: Thu, 29 Sep 2016 14:40:23 +0000 (+0200) Subject: Events list and details X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c1baca161682c56696484caa1720d81a465d1f6e;p=mezzo.git Events list and details --- diff --git a/app/static/src/sass/modules/_all.scss b/app/static/src/sass/modules/_all.scss index ed2511ba..95236e32 100755 --- a/app/static/src/sass/modules/_all.scss +++ b/app/static/src/sass/modules/_all.scss @@ -13,6 +13,7 @@ @import 'boxes/page-box'; @import 'boxes/brief-box'; @import 'boxes/person-list-box'; +@import 'boxes/event-line-box'; // Sliders @import 'sliders/slider-page'; diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss index 719d228d..21852d8b 100644 --- a/app/static/src/sass/modules/_page.scss +++ b/app/static/src/sass/modules/_page.scss @@ -64,6 +64,12 @@ $module: ".page"; } + &__filters { + + @include margin(0 0 6 0); + + } + hr + #{$module}__block--yellow { @include margin-top(-2); diff --git a/app/static/src/sass/modules/boxes/_event-line-box.scss b/app/static/src/sass/modules/boxes/_event-line-box.scss new file mode 100644 index 00000000..290bac26 --- /dev/null +++ b/app/static/src/sass/modules/boxes/_event-line-box.scss @@ -0,0 +1,72 @@ +$module: ".event-line-box"; + +#{$module} { + + &__content { + + &:after { + + content: ""; + display: block; + width: 100%; + height: 1px; + background: rgba(0, 0, 0, 0.5); + + @include margin(1 0 2 0); + + @include mq($until: sm) { + @include margin(1 0 1 0); + } + + } + + } + + &__month { + + @include font-size(l); + @include line-height(1); + @include typeface(serif); + font-weight: weight(heavy); + + @include mq($until: sm) { + display: none; + } + + } + + &__image { + + width: 100%; + height: auto; + + } + + &__tags { + + margin-bottom: 5px; + + } + + &__title { + + @include font-size(xxl); + @include line-height(1.25); + @include typeface(sans-serif); + font-weight: weight(bold); + + margin-top: 0; + @include margin-bottom(1); + + } + + &__desc { + + @include font-size(m); + @include line-height(1); + @include typeface(serif); + font-weight: weight(light); + + } + +} diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index f9f979df..d1680a9b 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -46,6 +46,9 @@ {% block breadcrumb_menu %} {{ block.super }} +
  • + {% trans "Agenda" %} +
  • {{ event.title }}
    • {% endblock %} diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html index 64ceebdc..907fb3b3 100644 --- a/app/templates/agenda/event_list.html +++ b/app/templates/agenda/event_list.html @@ -27,10 +27,10 @@ {% block breadcrumb_menu %} {{ block.super }} -
  • - {% trans "Agenda" %} -
    • {% if tag or location or month or week or author %} +
  • + {% trans "Agenda" %} +
  • {% if tag %} {% trans "Tag:" %} {{ tag }} @@ -47,32 +47,65 @@ {% trans "Author:" %} {{ author.get_full_name|default:author.username }} {% endif %}
    • + {% else %} +
  • + {% trans "Agenda" %} +
    • {% endif %} {% endblock %} {% block main %} -
    -
    - {% for event in events.object_list %} - {% include 'agenda/includes/event_card.html' %} - {% endfor %} -
    -
    -{% endblock %} -{# {% trans "Subscribe to all events in" %} Google Calendar/Outlook/iCal#} +
    -{% pagination_for events %} +
    -{% if settings.COMMENTS_DISQUS_SHORTNAME %} -{% include "generic/includes/disqus_counts.html" %} -{% endif %} +
    -{% block page_title %} -

    - {% if page %} - {{ page.richtextpage.meta_title }} - {% else %} - {% trans "Agenda" %} - {% endif %} -

    +
    +

    + {% if page %} + {{ page.richtextpage.meta_title }} + {% else %} + {% trans "Agenda" %} + {% endif %} +

    + +
    + {% keywords_for mezzanine_agenda.event as tags %} + {% all_events as all_events %} + {% if tags %} + {% trans "All events" %} ({{ all_events.count }}) + {% for t in tags %} + + {{ t }} ({{ t.item_count }}) + + {% endfor %} + {% endif %} +
    + +
    + +
    + +
    + +
    + +
    +
    + {% for event in events.object_list %} + {% include 'agenda/includes/event_linecard.html' %} + {% endfor %} +
    +
    + +
    + +
    + +
    + + {% pagination_for events %} + +
    {% endblock %} diff --git a/app/templates/agenda/includes/event_linecard.html b/app/templates/agenda/includes/event_linecard.html new file mode 100644 index 00000000..e41f7a45 --- /dev/null +++ b/app/templates/agenda/includes/event_linecard.html @@ -0,0 +1,63 @@ +{% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags organization_tags %} + +
    + +
    + + {% ifchanged event.start.month %} + {{ event.start|date:'F' }} + {% endifchanged %} + +
    + +
    + +
    + +
    + {% with True as unit_booking %} + {% with True as line_display %} + {% include 'agenda/includes/event_metainfo.html' %} + {% endwith %} + {% endwith %} +
    +
    + {% with event.images.all|get_type:'card' as images %} + {% if images %} + + + + {% endif %} + {% endwith %} +
    +
    + {% keywords_for event as tags %} + {% if event.departments.all.0 or tags %} +
    + {% if event.departments.all.0 %} +
    + {{ event.departments.all.0.department.name }} +
    + {% endif %} + {% keywords_for event as tags %} + {% if tags %} +
    + {% keywords_for event as tags %} + {{tags.0}} +
    + {% endif %} +
    + {% endif %} +

    + {{ event.title }} +

    +
    + {{ event.description|slice:":128" }} +
    +
    + +
    + +
    + +
    diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html index 0804eb1c..c13f8ffe 100644 --- a/app/templates/agenda/includes/event_metainfo.html +++ b/app/templates/agenda/includes/event_metainfo.html @@ -16,9 +16,11 @@ {{ event.location.room }} {% endif %} + {% if not line_display %} {% google_static_map event 900 300 15 %} - + + {% endif %}
    {% endif %} @@ -43,7 +45,9 @@

    {% else %} - {% trans "Free entry. Limited seats available" %} +

    + {% trans "Free entry. Limited seats available" %} +

    {% endif %} {% endif %}