From: Jérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Date: Mon, 17 Oct 2016 15:15:07 +0000 (+0200)
Subject: Add tournees banner and menu link
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=129bbc94ba78400b7f0a6dee6095cb8b596bfadf;p=mezzo.git

Add tournees banner and menu link
---

diff --git a/app/static/src/sass/modules/_banner.scss b/app/static/src/sass/modules/_banner.scss
index e3114c95..39cc834a 100644
--- a/app/static/src/sass/modules/_banner.scss
+++ b/app/static/src/sass/modules/_banner.scss
@@ -99,6 +99,25 @@ $module: ".banner";
 
     }
 
+    &--small {
+
+        height: 150px;
+        margin-top: 0;
+
+        @include mq($until: lg) {
+
+            height: 150px;
+
+        }
+
+        #{$module}__content {
+
+            padding-top: 40px;
+
+        }
+
+    }
+
     &__content {
 
         position: absolute;
diff --git a/app/static/src/sass/modules/navs/_nav-tree.scss b/app/static/src/sass/modules/navs/_nav-tree.scss
index adcbec96..876790bc 100644
--- a/app/static/src/sass/modules/navs/_nav-tree.scss
+++ b/app/static/src/sass/modules/navs/_nav-tree.scss
@@ -10,6 +10,12 @@ $module: ".nav-tree";
     position: absolute;
     width: 100%;
 
+    @include mq($until: sm) {
+
+        position: static;
+
+    }
+
     .nav-tree & {
         position: relative;
     }
diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index 663d61a8..a8162bca 100644
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -1,5 +1,5 @@
 {% extends "pages/page.html" %}
-{% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags organization_tags %}
+{% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags organization_tags staticfiles %}
 
 {% block meta_title %}
     {% if page %}
@@ -27,9 +27,13 @@
 
 {% block breadcrumb_menu %}
     {{ block.super }}
-    {% if tag or location or month or week or author %}
+    {% if tag and tag|tag_is_excluded %}
+    <li class="breadcrumb__item">
+        <a href="{% url 'event_list' %}" class="breadcrumb__link">{% trans "Tournées" %}</a>
+    </li>
+    {% elif tag or location or month or week or author %}
         <li class="breadcrumb__item">
-            <a href="{% url 'event_list' %}" class="breadcrumb__link">{% trans "Agenda" %}</a>
+            <a href="{% url 'event_list' %}" class="breadcrumb__link">{% trans "Rendez-vous" %}</a>
         </li>
         <li class="breadcrumb__item active">
             {% if tag %}
@@ -49,7 +53,7 @@
         </li>
     {% else %}
         <li class="breadcrumb__item active">
-            {% trans "Agenda" %}
+            {% trans "Rendez-vous" %}
         </li>
     {% endif %}
 {% endblock %}
@@ -67,7 +71,11 @@
                         {% if page %}
                             {{ page.richtextpage.meta_title }}
                         {% else %}
-                            {% trans "Agenda" %}
+                            {% if tag and tag|tag_is_excluded %}
+                                {% trans "Tournées" %}
+                            {% else %}
+                                {% trans "Rendez-vous" %}
+                            {% endif %}
                         {% endif %}
                     </h1>
 
@@ -81,7 +89,13 @@
 
                     <ul class="nav-tree nav-tree--level-{{ branch_level }}" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
                         <li class="nav-tree__item">
-                            <a class="nav-tree__link active" href="{{ page.get_absolute_url }}">{% trans 'Agenda' %}</a>
+                            <a class="nav-tree__link active" href="{{ page.get_absolute_url }}">
+                                {% if tag and tag|tag_is_excluded %}
+                                    {% trans "Tournées" %}
+                                {% else %}
+                                    {% trans "Rendez-vous" %}
+                                {% endif %}
+                            </a>
 
                             <ul class="nav-tree" data-summary>
                                 <li class="nav-tree__item nav-tree__item--sub hide">
@@ -90,34 +104,75 @@
                             </ul>
                         </li>
 
+                        {% if tag and tag|tag_is_excluded %}
+                            <li class="nav-tree__item">
+                                <a class="nav-tree__link" href="{% url 'event_list' %}">
+                                    {% trans "Rendez-vous" %}
+                                </a>
+                            </li>
+                        {% else %}
+                            <li class="nav-tree__item">
+                                <a class="nav-tree__link" href="{% url 'event_list_tag' 'tournees' %}">
+                                    {% trans "Tournées" %}
+                                </a>
+                            </li>
+                        {% endif %}
+
                         <li class="nav-tree__separator">
 
                         </li>
 
-                        {% keywords_for mezzanine_agenda.event as tags %}
-                        {# {% all_events as all_events %}#}
-                        {% if tags %}
-                            {% comment %}
-                                <a href="{% url 'event_list' %}" class="button{% if not tag %} button--black{% else %} button--white{% endif %}">{% trans "All events" %}</a>
-                            {% endcomment %}
-                            {% for t in tags %}
-                                {% if not t|tag_is_excluded %}
-                                    <li class="nav-tree__item">
-                                        <a class="nav-tree__link--filter nav-tree__link{% if tag == t %} active{% endif %}" href="{% if tag == t %}{% url 'event_list' %}{% else %}{% url "event_list_tag" t.slug %}{% endif %}">
-                                            {{ t }} {% if tag == t %}<i class="fa fa-times"></i>{% endif %}
-                                        </a>
-                                    </li>
-                                {% endif %}
-                            {% endfor %}
+                        {% if tag and not tag|tag_is_excluded or not tag %}
+
+                            {% keywords_for mezzanine_agenda.event as tags %}
+                            {# {% all_events as all_events %}#}
+                            {% if tags %}
+                                {% comment %}
+                                    <a href="{% url 'event_list' %}" class="button{% if not tag %} button--black{% else %} button--white{% endif %}">{% trans "All events" %}</a>
+                                {% endcomment %}
+                                {% for t in tags %}
+                                    {% if not t|tag_is_excluded %}
+                                        <li class="nav-tree__item">
+                                            <a class="nav-tree__link--filter nav-tree__link{% if tag == t %} active{% endif %}" href="{% if tag == t %}{% url 'event_list' %}{% else %}{% url "event_list_tag" t.slug %}{% endif %}">
+                                                {{ t }} {% if tag == t %}<i class="fa fa-times"></i>{% endif %}
+                                            </a>
+                                        </li>
+                                    {% endif %}
+                                {% endfor %}
+                            {% endif %}
+
                         {% endif %}
                     </ul>
 
                 </div>
 
-                <div class="mb2 col-sm-9 col-lg-8 white-bg page__content" data-summary-content>
+                <div class="mb2 col-sm-9 col-lg-10 white-bg page__content" data-summary-content>
 
                     <div class="white-bg page__content">
                         <div class="container">
+
+                            {% if tag and not tag|tag_is_excluded or not tag %}
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <a class="banner banner--light banner--small" href="{% url 'event_list_tag' 'tournees' %}" style="background-image:url({% static 'img/services/tours.jpg' %});">
+
+                                            <div class="banner__content">
+
+                                                <div class="banner__title fsxxxl">
+                                                    Tournées 16.17
+                                                </div>
+                                                <div class="banner__desc fss">
+                                                    Campo Santo, Songes et Métamorphoses, Providences, UM souverain moteur de toutes choses...
+                                                </div>
+
+                                            </div>
+
+                                        </a>
+                                    </div>
+                                </div>
+                            {% endif %}
+
+
                             {% for event in events.object_list %}
                                 {% include 'agenda/includes/event_linecard.html' %}
                             {% endfor %}
diff --git a/app/templates/agenda/includes/event_linecard.html b/app/templates/agenda/includes/event_linecard.html
index 7884195a..23796806 100644
--- a/app/templates/agenda/includes/event_linecard.html
+++ b/app/templates/agenda/includes/event_linecard.html
@@ -25,13 +25,13 @@
                 {% with event.images.all|get_type:'card' as images %}
                     {% if images %}
                         <a href="{{ event.get_absolute_url }}">
-                            <img class="event-line-box__image" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images.0.file 203 140 %}" width="203" height="140" class="lazyload">
+                            <img class="event-line-box__image lazyload" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images.0.file 203 140 %}" width="203" height="140">
                         </a>
                     {% else %}
                         {% with event.parent.images.all|get_type:'card' as images %}
                             {% if images %}
                                 <a href="{{ event.get_absolute_url }}">
-                                    <img class="event-line-box__image" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images.0.file 203 140 %}" width="203" height="140" class="lazyload">
+                                    <img class="event-line-box__image lazyload" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images.0.file 203 140 %}" width="203" height="140">
                                 </a>
                             {% endif %}
                         {% endwith %}
diff --git a/app/templates/home/inc/services.html b/app/templates/home/inc/services.html
index 377c9bd6..558e57e4 100644
--- a/app/templates/home/inc/services.html
+++ b/app/templates/home/inc/services.html
@@ -6,7 +6,7 @@
 
         <div class="col-sm-6">
 
-            <a class="banner banner--light" href="#" style="background-image:url({% static 'img/services/tours.jpg' %});">
+            <a class="banner banner--light" href="{% url 'event_list_tag' 'tournees' %}" style="background-image:url({% static 'img/services/tours.jpg' %});">
 
                 <div class="banner__content">