Events update (list and details)

diff --git a/app/static/src/sass/global/_helpers.scss b/app/static/src/sass/global/_helpers.scss
index 5ef0e7abc0153129e8ff6f1e604fedc0520f1507..0f0a2064169135cf7591361532e258aad2c526c2 100755 (executable)
--- a/app/static/src/sass/global/_helpers.scss
+++ b/app/static/src/sass/global/_helpers.scss
@@ -37,6 +37,30 @@
 .ml2 {
     @include margin-left(2);
 }
+.mt3 {
+    @include margin-top(3);
+}
+.mb3 {
+    @include margin-bottom(3);
+}
+.mr3 {
+    @include margin-right(3);
+}
+.ml3 {
+    @include margin-left(3);
+}
+.mt4 {
+    @include margin-top(4);
+}
+.mb4 {
+    @include margin-bottom(4);
+}
+.mr4 {
+    @include margin-right(4);
+}
+.ml4 {
+    @include margin-left(4);
+}
 .p1 {
     @include padding(1);
 }

diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss
index 471673b350d7807baee05675a2a64ef6a7480e73..afc8735c93a23766551ef5bc6eb231b24ea21c09 100644 (file)
--- a/app/static/src/sass/modules/_page.scss
+++ b/app/static/src/sass/modules/_page.scss
@@ -37,6 +37,10 @@ $module: ".page";
 
         @include margin(1 0);
 
+        &--small {
+            @include margin(.5 0);
+        }
+
     }
 
     &__meta-date {
@@ -62,6 +66,10 @@ $module: ".page";
         @include typeface(serif);
         font-weight: weight(heavy);
 
+        &--small {
+            @include font-size(s);
+        }
+
     }
 
     &__meta-text {

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index a84615413ce5aac09c1a89040f5eafd40cb98822..2e2ed648571c91e7b5dbd74df9d64735b2507a57 100644 (file)
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -117,19 +117,23 @@
 {% endblock %}
 
 {% block page_link %}
-    <div class="row">
-        {% with event.links.all as links %}
-            {% if links %}
+
+    <div class="mt4">
+        <div class="row">
+            {% with event.links.all as links %}
+                {% if links %}
+                    <div class="col-xs-6">
+                        {% include 'core/inc/link.html' %}
+                    </div>
+                {% endif %}
+            {% endwith %}
+            {% if event.mentions %}
                 <div class="col-xs-6">
-                    {% include 'core/inc/link.html' %}
+                    <div class="small-text">
+                        {{ event.mentions }}
+                   </div>
                 </div>
             {% endif %}
-        {% endwith %}
-        <div class="col-xs-6">
-            <div class="small-text">
-                Notes de productions<br />
-                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quod, modi sunt culpa sequi. Consequatur voluptate sapiente minus repellat earum, rerum asperiores, architecto quibusdam, dolore, soluta placeat aliquid. Voluptatum, dignissimos, quisquam.
-            </div>
         </div>
     </div>
 
@@ -151,7 +155,7 @@
     {% endwith %}
 {% endblock %}
 
-{% block page_videos %}
+{% block page_video %}
     {% with event.videos.all as videos %}
         {% if videos %}
             {% include 'core/inc/slider_video.html' %}
@@ -161,15 +165,50 @@
 
 {% block page_person_list %}
     {% if event.persons.all %}
-        {% if event.trainings.all %}
-            {% trans "Trainers" %}<br>
-        {% else %}
-            {% trans "Persons" %}<br>
-        {% endif %}
-        {% for person in event.persons.all %}
-            {{ person.person.title }}<br>
-            {{ person.person.bio|safe }}<br>
-        {% endfor %}
+        <div class="white-bg pb2">
+            <hr class="mt0" />
+            <div class="container">
+
+                <div class="row">
+
+                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2" data-summary-content>
+
+                        <h2 class="dotted">
+                            {% if event.trainings.all %}
+                                {% trans "Trainers" %}<br>
+                            {% else %}
+                                {% trans "Persons" %}<br>
+                            {% endif %}
+                        </h2>
+
+                    </div>
+
+                </div>
+
+            </div>
+
+            <div class="container-fluid">
+
+                <div class="row tac">
+
+                    {% for person in event.persons.all %}
+
+                        <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
+
+                            <div class="article-box article-box--person" >
+                                {% with person.person as person %}
+                                    {% include "network/inc/person/person_card_square.html" %}
+                                {% endwith %}
+                            </div>
+
+                        </div>
+
+                    {% endfor %}
+
+                </div>
+            </div>
+
+        </div>
     {% endif %}
 {% endblock %}
 

diff --git a/app/templates/agenda/includes/event_linecard.html b/app/templates/agenda/includes/event_linecard.html
index 44e85911c7b7e484673bd1bccfa4529922135107..bebd2e3bd09956bf68fa810131b51a87458c360d 100644 (file)
--- a/app/templates/agenda/includes/event_linecard.html
+++ b/app/templates/agenda/includes/event_linecard.html
@@ -37,11 +37,9 @@
                               {{ event.departments.all.0.department.name }}
                             </div>
                         {% endif %}
-                        {% keywords_for event as tags %}
-                        {% if tags %}
+                        {% if event.category %}
                             <div class="tag tag--small tag--category">
-                                {% keywords_for event as tags %}
-                                {{tags.0}}
+                                {{ event.category }}
                             </div>
                         {% endif %}
                     </div>

diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index f8f529e100748be7e97a36cdca505d4c0a65582b..328abcd5c289f87c3263c852a253573eff34964e 100644 (file)
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@ -13,19 +13,33 @@
             <small><u>{{ event.location.room }}</u></small>
         {% endif %}
     </a>
-    <a href="{{ event|google_nav_url }}" target="_blank" class="">
+    <a href="{{ event|google_nav_url }}" target="_blank" class="mt1" style="display: block;">
          {% google_static_map event 900 300 20 %}
     </a>
 
     <div class="page__meta-separator"></div>
 {% endif %}
 
+{% with event.trainings.all.0 as training %}
+    {% if training %}
+        <div class="page__meta-title page__meta-title--small">{% trans "Language" %}</div>
+        <p class="page__meta-text">{{ training.language }}</p>
+        <div class="page__meta-title page__meta-title--small">{% trans "Public type" %}</div>
+        <p class="page__meta-text">{{ training.public_type }}</p>
+        <div class="page__meta-title page__meta-title--small">{% trans "Level" %}</div>
+        <p class="page__meta-text">{{ training.level }}</p>
+    {% endif %}
+{% endwith %}
+
 {% if unit_booking %}
     {% if event.prices.all.0|floatformat != '0' and event.prices.all|length > 0 %}
         {% for price in event.prices.all %}
             {% if forloop.first %}
-                <div class="page__meta-title">{% trans "Prices" %}</div>
-                <p>
+                <div class="page__meta-title page__meta-title--small">{% trans "Prices" %}</div>
+                <p class="page__meta-text">
+            {% endif %}
+            {% if price.unit %}
+                {{ price.unit }}:
             {% endif %}
             {{ price.value|floatformat:"-2" }} €{% if not forloop.last %} <br /> {% endif %}
             {% if forloop.last %}
@@ -38,22 +52,14 @@
             </a>
         </p>
     {% else %}
-        <p>
-            {% trans "Free entry. Limited seats available" %}
-        </p>
+        {% if event.prices.all.0|floatformat != '0' %}
+            <p>
+                {{ price.unit }}
+            </p>
+        {% else %}
+            <p>
+                {% trans "Free entry. Limited seats available" %}
+            </p>
+        {% endif %}
     {% endif %}
 {% endif %}
-
-{% with event.trainings.all.0 as training %}
-    {% if training %}
-        <div class="page__meta-title">{% trans "Language" %}
-            <p>{{ training.language }}</p>
-        </div>
-        <div class="page__meta-title">{% trans "Public type" %}
-            <p>{{ training.public_type }}</p>
-        </div>
-        <div class="page__meta-title">{% trans "Level" %}
-            <p>{{ training.level }}</p>
-        </div>
-    {% endif %}
-{% endwith %}

diff --git a/app/templates/agenda/includes/event_metainfo_line.html b/app/templates/agenda/includes/event_metainfo_line.html
index ae27e3e55248e95224353d9a579cc2aa2522f5d8..2f25d8bc5713234bc3e096465402bd95d349f912 100644 (file)
--- a/app/templates/agenda/includes/event_metainfo_line.html
+++ b/app/templates/agenda/includes/event_metainfo_line.html
@@ -6,7 +6,7 @@
     </a>
 </div>
 
-<div class="page__meta-separator"></div>
+<div class="page__meta-separator page__meta-separator--small"></div>
 
 {% if event.location %}
     <a href="{% url 'location-detail' event.location.slug %}">
@@ -18,7 +18,7 @@
 
     {% if event.prices.all.0|floatformat != '0' and event.prices.all|length > 0 %}
         <p>
-            <a class="button button--block button--small" href="{% url 'event_booking' event.slug %}" class="event__meta__btn">
+            <a class="button button--small mt1" href="{% url 'event_booking' event.slug %}" class="event__meta__btn">
                 {% trans "Reserve" %}
             </a>
         </p>

diff --git a/app/templates/network/inc/person/list_square_style.html b/app/templates/network/inc/person/list_square_style.html
index d5134bfe248d5c505c1bd9ee97250b25288ec52d..fef07cc6b17277d07c23511bc4e6151a29dd5203 100644 (file)
--- a/app/templates/network/inc/person/list_square_style.html
+++ b/app/templates/network/inc/person/list_square_style.html
@@ -32,29 +32,7 @@
                         <div class="article-box article-box--person" >
                             {% with person_list_block_inline.person as person %}
 
-                                    {% with person.images.all|get_type:'card' as card_images %}
-                                        {% if card_images %}
-                                            <div class="article-box__header">
-                                                <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}">
-                                                    <figure class="article-box__image">
-                                                        <img class="lazyload" src="{{ MEDIA_URL }}{% thumbnail card_images.first 427 500 top=0.5 %}" alt="person"/>
-                                                    </figure>
-                                                </a>
-                                            </div>
-                                        {% endif %}
-                                    {% endwith %}
-
-                                    <div class="article-box__content tal">
-
-                                        <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}"><h3 class="article-box__title">{{ person.first_name }}&nbsp;{{ person.last_name }}</h3></a>
-
-                                        {% if person.description %}
-                                            <div class="article-box__desc">{{ person.description|richtext_filters|safe|truncatechars_html:255 }}</div>
-                                        {% elif person.bio %}
-                                            <div class="article-box__desc">{{ person.bio|richtext_filters|safe|truncatechars_html:255 }}</div>
-                                        {% endif %}
-
-                                    </div>
+                                    {% include "network/inc/person/person_card_square.html" %}
 
                             {% endwith %}
                         </div>

diff --git a/app/templates/network/inc/person/person_card_square.html b/app/templates/network/inc/person/person_card_square.html
new file mode 100644 (file)
index 0000000..aa8b3d2
--- /dev/null
+++ b/app/templates/network/inc/person/person_card_square.html
@@ -0,0 +1,25 @@
+{% load organization_tags mezzanine_tags %}
+
+{% with person.images.all|get_type:'card' as card_images %}
+    {% if card_images %}
+        <div class="article-box__header">
+            <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}">
+                <figure class="article-box__image">
+                    <img class="lazyload" src="{{ MEDIA_URL }}{% thumbnail card_images.first 427 500 top=0.5 %}" alt="person"/>
+                </figure>
+            </a>
+        </div>
+    {% endif %}
+{% endwith %}
+
+<div class="article-box__content tal">
+
+    <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}"><h3 class="article-box__title">{{ person.first_name }}&nbsp;{{ person.last_name }}</h3></a>
+
+    {% if person.description %}
+        <div class="article-box__desc">{{ person.description|richtext_filters|safe|truncatechars_html:255 }}</div>
+    {% elif person.bio %}
+        <div class="article-box__desc">{{ person.bio|richtext_filters|safe|truncatechars_html:255 }}</div>
+    {% endif %}
+
+</div>