From: Jérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Date: Fri, 30 Sep 2016 08:03:41 +0000 (+0200)
Subject: Events list update
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=615b351a8bdbe9fa016e672673957749d799e73a;p=mezzo.git

Events list update
---

diff --git a/app/static/src/sass/modules/boxes/_event-line-box.scss b/app/static/src/sass/modules/boxes/_event-line-box.scss
index 18cb7d26..e47dcc99 100644
--- a/app/static/src/sass/modules/boxes/_event-line-box.scss
+++ b/app/static/src/sass/modules/boxes/_event-line-box.scss
@@ -12,7 +12,7 @@ $module: ".event-line-box";
             height: 1px;
             background: rgba(0, 0, 0, 0.25);
 
-            @include margin(1 0 2 0);
+            @include margin(1 0 1 0);
 
             @include mq($until: sm) {
                 @include margin(1 0 1 0);
diff --git a/app/templates/agenda/includes/event_linecard.html b/app/templates/agenda/includes/event_linecard.html
index e41f7a45..44e85911 100644
--- a/app/templates/agenda/includes/event_linecard.html
+++ b/app/templates/agenda/includes/event_linecard.html
@@ -16,9 +16,7 @@
 
             <div class="col-xs-3">
                 {% with True as unit_booking %}
-                {% with True as line_display %}
-                    {% include 'agenda/includes/event_metainfo.html' %}
-                {% endwith %}
+                    {% include 'agenda/includes/event_metainfo_line.html' %}
                 {% endwith %}
             </div>
             <div class="col-xs-3">
@@ -35,7 +33,7 @@
                 {% if event.departments.all.0 or tags %}
                     <div class="event-line-box__tags">
                         {% if event.departments.all.0 %}
-                            <div class="tag tag--small dashed dashed--gray">
+                            <div class="tag tag--small dashed">
                               {{ event.departments.all.0.department.name }}
                             </div>
                         {% endif %}
@@ -52,7 +50,7 @@
                     <a href="{{ event.get_absolute_url }}">{{ event.title }}</a>
                 </h2>
                 <div class="event-line-box__desc">
-                    {{ event.description|slice:":128" }}
+                    {{ event.description|slice:":100" }}
                 </div>
             </div>
 
diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index 4b5f2e7c..99e99f98 100644
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@ -16,11 +16,9 @@
             <small><u>{{ event.location.room }}</u></small>
         {% endif %}
     </a>
-    {% if not line_display %}
     <a href="{{ event|google_nav_url }}" target="_blank" class="">
          {% google_static_map event 900 300 20 %}
     </a>
-    {% endif %}
 
     <div class="page__meta-separator"></div>
 {% endif %}
diff --git a/app/templates/agenda/includes/event_metainfo_line.html b/app/templates/agenda/includes/event_metainfo_line.html
new file mode 100644
index 00000000..326e680b
--- /dev/null
+++ b/app/templates/agenda/includes/event_metainfo_line.html
@@ -0,0 +1,25 @@
+{% load i18n mezzanine_tags event_tags  %}
+
+<div class="page__meta-date">
+    {% include 'agenda/includes/event_date.html' %}
+</div>
+
+<div class="page__meta-separator"></div>
+
+{% if event.location %}
+    <a href="{% url 'location-detail' event.location.slug %}">
+        <div class="page__meta-title">{{ event.location }}</div>
+    </a>
+{% endif %}
+
+{% if unit_booking %}
+
+    {% 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">
+                {% trans "Reserve" %}
+            </a>
+        </p>
+    {% endif %}
+
+{% endif %}