From 1f46e3fa68399976fc713259918001eab360e42a Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 26 Mar 2021 09:37:19 +0100
Subject: [PATCH 01/11] replace static tag with STATIC_URL route

---
 .../templates/includes/footer_scripts.html    | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/ircam_www_theme/templates/includes/footer_scripts.html b/ircam_www_theme/templates/includes/footer_scripts.html
index 3f30031a..d9f1d370 100644
--- a/ircam_www_theme/templates/includes/footer_scripts.html
+++ b/ircam_www_theme/templates/includes/footer_scripts.html
@@ -1,21 +1,23 @@
 {% load mezzanine_tags i18n staticfiles %}
 
-    <script src="{% static "vendors/jquery/jquery.js" %}"></script>
-    <script src="{% static "vendors/overflow.js/js/overflow.js" %}"></script>
-    <script src="{% static "vendors/sticky-kit/jquery.sticky-kit.js" %}"></script>
-    <script src="{% static "vendors/jquery-throttle-debounce/jquery.ba-throttle-debounce.js" %}"></script>
-    <script src="{% static "vendors/lightslider/dist/js/lightslider.js" %}"></script>
-    <script src="{% static "vendors/lightgallery/dist/js/lightgallery.js" %}"></script>
-    <script src="{% static "vendors/imagesloaded/imagesloaded.pkgd.js" %}"></script>
-    <script src="{% static "vendors/pushy/js/pushy.js" %}"></script>
-    <script src="{% static "vendors/video.js/dist/video.js" %}"></script>
-    <script src="{% static "vendors/videojs-playlist/dist/videojs-playlist.js" %}"></script>
-    <script src="{% static "vendors/audiojs/audiojs/audio.js" %}"></script>
-    <script src="{% static "vendors/jquery_lazyload/jquery.lazyload.js" %}"></script>
-    <script src="{% static "vendors/waypoints/lib/jquery.waypoints.js" %}"></script>
-    <script src="{% static "js/index.min.js?v=1.1" %}"></script>
+{% compress js %}
+    <script src="{{ STATIC_URL }}/vendors/jquery/jquery.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/overflow.js/js/overflow.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/sticky-kit/jquery.sticky-kit.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/jquery-throttle-debounce/jquery.ba-throttle-debounce.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/lightslider/dist/js/lightslider.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/lightgallery/dist/js/lightgallery.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/imagesloaded/imagesloaded.pkgd.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/pushy/js/pushy.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/video.js/dist/video.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/videojs-playlist/dist/videojs-playlist.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/audiojs/audiojs/audio.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/jquery_lazyload/jquery.lazyload.js"></script>
+    <script src="{{ STATIC_URL }}/vendors/waypoints/lib/jquery.waypoints.js"></script>
+    <script src="{{ STATIC_URL }}/js/index.min.js?v=1.1"></script>
 {% block extra_js %}{% endblock %}
 {% editable_loader %}
+{% endcompress %}
 
 {% if settings.GOOGLE_ANALYTICS_ID and not request.user.is_staff and not settings.DEBUG %}
 <script>

From b967747c3520b60afc96bbc88faaad06c3192a5f Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Wed, 31 Mar 2021 18:03:58 +0200
Subject: [PATCH 02/11] dashboard services front end

---
 .../modules/boxes/_dashboardservice-box.scss  | 285 ++++++++++++++++++
 .../includes/dashboard_card.html              |  57 ++++
 .../includes/dashboardservice_card.html       |  48 +++
 .../pages/dashboardservice_list.html          |  60 ++++
 4 files changed, 450 insertions(+)
 create mode 100644 ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss
 create mode 100644 ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
 create mode 100644 ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
 create mode 100644 ircam_www_theme/templates/pages/dashboardservice_list.html

diff --git a/ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss b/ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss
new file mode 100644
index 00000000..bd80663b
--- /dev/null
+++ b/ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss
@@ -0,0 +1,285 @@
+// -*- coding: utf-8 -*-
+
+// Copyright (c) 2016-2017 Ircam
+// Copyright (c) 2016-2017 Jérémy Fabre
+
+// This file is part of mezzanine-organization.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+$module: ".dashboardservice-box";
+
+#{$module} {
+
+    position: relative;
+    background: white;
+    display: block;
+    @include margin-bottom(1);
+    @include transition(all 0.25s ease-in-out);
+
+    &:hover {
+        box-shadow: 0px 0px 14px 0px rgba(0,0,0,0.17);
+        .dashboardservice-box__image {
+
+            img {
+                @include transform(scale(1.1));
+            }
+
+            &:after {
+                border-width: 12px;
+            }
+        }
+    }
+
+    &__header {
+        position: relative;
+    }
+
+    &__image {
+        margin: 0;
+        padding: 0;
+        width: 100%;
+        position: relative;
+        /*overflow: hidden;*/
+
+        @include fluid-aspect(427 286);
+
+        img {
+            display: block;
+            width: 100%;
+            max-width: 100%;
+            height: auto;
+            @include transition(all 0.3s ease-in-out);
+        }
+
+        &:after {
+            content: '';
+            display: block;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            border-width: 0px;
+            border-color: white;
+            border-style: solid;
+            @include transition(all 0.25s ease-in-out);
+        }
+    }
+
+    &__placeholder {
+
+        background: $color-main;
+
+        &.recherche, &.research {
+            background-color: white;
+            background-image: url(../img/patterns/squares.png);
+            opacity: 0.4;
+        }
+        &.creation {
+            background-color: white;
+            background-image: url(../img/patterns/circles.png);
+            opacity: 0.2;
+        }
+        &.transmission {
+            background-color: white;
+            background-image: url(../img/patterns/stripes.png);
+            opacity: 0.4;
+        }
+        &.innovation, &.innovations {
+            background-color: white;
+            background-image: url(../img/patterns/triangles.png);
+            opacity: 0.2;
+        }
+
+    }
+
+    &__tags {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+
+        @include margin-bottom(.55);
+    }
+
+    &__btn {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+
+        @include margin-bottom(.5);
+        @include margin-right(.5);
+    }
+
+    &__content {
+        @include padding(.25 .25 1 .25);
+
+        position: relative;
+        overflow: hidden;
+
+        @include mq($until: xs) {
+            height: auto;
+        }
+
+        /*&:after {
+
+            @include mq($until: xs) {
+                display: none;
+            }
+
+            content: "";
+            display: block;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            height: 100px;
+            background-color: rgba(255,255,255,0);
+            @include filter-gradient(#ffffff, #ffffff, vertical);
+            @include background-image(linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 50%));
+        }*/
+    }
+
+    &__title {
+        @include font-size(xl);
+        @include line-height(1.25);
+        @include typeface(sans-serif);
+        @include margin(0 0 .25 0);
+    }
+
+    &__subtitle {
+        @include font-size(s);
+        @include line-height(.75);
+        @include typeface(serif);
+        @include margin-top(.25);
+        font-weight: weight(regular);
+
+        .slider-home & {
+
+            @include font-size(m);
+            @include line-height(1);
+            @include typeface(sans-serif);
+            @include margin-top(.25);
+            font-weight: weight(regular);
+
+        }
+
+    }
+
+    &__desc {
+        @include font-size(s);
+        @include line-height(.75);
+        @include typeface(serif);
+        @include margin(1 0 .25 0);
+        font-weight: weight(light);
+    }
+
+    &--small {
+
+        .dashboardservice-box__content {
+            height: auto;
+            &:after {
+                display: none;
+            }
+        }
+
+        .dashboardservice-box__btn {
+            display: none;
+        }
+
+    }
+
+    .slider-home & {
+        display: inline-block;
+        max-width: 450px;
+        background: transparent;
+
+        &__content {
+            background: white;
+            margin-top: 1px;
+        }
+    }
+
+    &--person {
+
+        @include margin-top(2);
+        position: relative;
+
+
+
+        &:after {
+
+            content: "";
+            display: block;
+            height: 1px;
+            width: 100%;
+            background: #979797;
+            position: absolute;
+            bottom: -24px;
+            left: 0;
+            right: 0;
+
+        }
+
+        #{$module}__title {
+
+            @include font-size(xl);
+            @include line-height(1.25);
+            @include typeface(sans-serif);
+            @include margin(.25 0 .25 0);
+            font-weight: weight(heavy);
+
+        }
+
+        #{$module}__image {
+
+            @include fluid-aspect(427 500);
+
+        }
+
+        #{$module}__desc {
+            @include line-height(1);
+        }
+
+        #{$module}__content {
+
+            height: 350px;
+
+            @include mq($until: xs) {
+                height: auto;
+            }
+
+            &:after {
+
+                @include mq($until: xs) {
+                    display: none;
+                }
+
+                content: "";
+                display: block;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                right: 0;
+                height: 100px;
+                background-color: rgba(255,255,255,0);
+                @include filter-gradient(#ffffff, #ffffff, vertical);
+                @include background-image(linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 50%));
+            }
+
+        }
+
+    }
+
+}
diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
new file mode 100644
index 00000000..711ace42
--- /dev/null
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
@@ -0,0 +1,57 @@
+{% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
+
+<a class="dashboardservice-box" href="
+    {% block url %}
+        {{ object.url }}
+    {% endblock %}"
+    {% block target %}
+        {{ object.url }} target="_blank"
+    {% endblock %}
+    title="{% block metatitle %}{{ object.title }}{% endblock %}">
+    <div class="dashboardservice-box__header">
+        {% block image %}
+            <!-- img src="/media/{{object.image}}" / -->
+            {% with object.image as images %}
+                {% if images %}
+                    <figure class="dashboardservice-box__image">
+                        <img src="{{ MEDIA_URL }}{% thumbnail images 400 280 %}" data-original="" class="lazyload" />
+                        <!-- img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images 427 286 top=0.5 left=object.photo_alignment|get_photo_alignment %}" class="lazyload" / -->
+                    </figure>
+                {% else %}
+                    <figure class="dashboardservice-box__image">
+                        {% if object.department %}
+                            <div class="dashboardservice-box__placeholder {{object.department.name|slugify}}"></div>
+                        {% else %}
+                            <div class="dashboardservice-box__placeholder"></div>
+                        {% endif %}
+                    </figure>
+                {% endif %}
+            {% endwith %}
+        {% endblock %}
+
+        {% block tags %}
+        {% endblock %}
+
+        {% block btn %}
+        {% endblock %}
+
+    </div>
+
+    <div class="dashboardservice-box__content tal">
+        <h3 class="dashboardservice-box__title">
+            {% block title %}
+                {{ object.title }}
+            {% endblock %}
+        </h3>
+        <div class="dashboardservice-box__subtitle">
+            {% block subtitle %}
+                {{ object.sub_title }}
+            {% endblock %}
+        </div>
+        <div class="dashboardservice-box__desc">
+            {% block content %}
+                {{ object.description|richtext_filters|safe|truncatechars_html:200 }}
+            {% endblock %}
+        </div>
+    </div>
+</a>
diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
new file mode 100644
index 00000000..09d9995f
--- /dev/null
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
@@ -0,0 +1,48 @@
+{% extends "pages/dashboardservice/includes/dashboard_card.html" %}
+{% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
+
+{% block metatitle %}
+    {{ block.super }}
+{% endblock %}
+
+{% block title %}
+    {{ block.super }}
+{% endblock %}
+
+{% block url %}
+    {{ block.super }}
+{% endblock %}
+
+{% block target %}
+    {{ block.super }}
+{% endblock %}
+
+{% block image %}
+    {{ block.super }}
+{% endblock %}
+
+{% block tags %}
+    <div class="dashboardservice-box__tags">
+        <div class="tag tag--small tag--category">
+            {% trans 'Services' %}
+        </div>
+        <div class="tag tag--small dashed dashed--gray dashed--small">
+            {{ object.dashboardservice.name }}
+        </div>
+    </div>
+{% endblock %}
+
+{% block content %}
+    {{ block.super }}
+{% endblock %}
+
+{% block subtitle %}
+    {% comment %}
+        {{ object.publish_date|date:"DATE_FORMAT" }}
+    {% endcomment %}
+    {% for category in object.categories.all %}
+        {% comment %}{% if forloop.first %} | {% endif %}{% endcomment %}
+        {% if not forloop.first %}, {% endif %}
+        <strong>{{ category }}</strong>
+    {% endfor %}
+{% endblock %}
diff --git a/ircam_www_theme/templates/pages/dashboardservice_list.html b/ircam_www_theme/templates/pages/dashboardservice_list.html
new file mode 100644
index 00000000..ea276ee9
--- /dev/null
+++ b/ircam_www_theme/templates/pages/dashboardservice_list.html
@@ -0,0 +1,60 @@
+{% extends "pages/page.html" %}
+{% load i18n  mezzanine_tags event_tags keyword_tags disqus_tags organization_tags staticfiles pages_tags %}
+
+{% block meta_title %}
+    {% if page %}
+        {{ page.title }}
+    {% else %}
+        {% trans "News" %}
+    {% endif %}
+{% endblock %}
+
+{% block meta_keywords %}
+    {% metablock %}
+        {% keywords_for page as keywords %}
+        {% for keyword in keywords %}
+            {% if not forloop.first %}, {% endif %}
+            {{ keyword }}
+        {% endfor %}
+    {% endmetablock %}
+{% endblock %}
+
+{% block meta_description %}
+    {% metablock %}
+        {{ page.description }}
+    {% endmetablock %}
+{% endblock %}
+
+
+{% block page_title %}
+    <h1 class="dotted">{% trans "Services" %}</h1>
+{% endblock %}
+
+{% block page_sidebar %}
+    <ul class="nav-tree nav-tree--level-0" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
+        {% for keyword in keywords %}
+            <li class="nav-tree__item">
+                {% if current_keyword_slug == keyword.keyword.slug %}
+                    <a href="{% url 'dashboard-service-list' %}" class="nav-tree__link nav-tree__link--filter active" title="">{{ keyword }}<i class="fa fa-times"></i></a>    
+                {% else %}
+                    <a href="{% url 'dashboard-service-list' keyword=keyword.keyword.slug %}" class="nav-tree__link nav-tree__link--filter" title="">{{ keyword }}</a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+{% endblock %}
+
+{% block page_content %}
+
+    {% for object in objects %}
+        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-6">
+            {% with app_label=object|app_label_short classname=object|classname|lower  %}
+                {% with app_label|add:"/"|add:classname|add:"/includes/"|add:classname|add:"_card.html" as template %}
+                    {% include template %}
+                {% endwith %}
+            {% endwith %}
+        </div>
+    {% endfor %}
+
+    {% pagination_for objects %}
+{% endblock %}

From e5ccb1d06b4cf0455995c054a2d3eb9a1ee2be27 Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Wed, 31 Mar 2021 19:27:44 +0200
Subject: [PATCH 03/11] fixup! dashboard services front end

---
 .../dashboardservice/includes/dashboardservice_card.html   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
index 09d9995f..96a21aca 100644
--- a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
@@ -23,11 +23,12 @@
 
 {% block tags %}
     <div class="dashboardservice-box__tags">
-        <div class="tag tag--small tag--category">
+        <!-- div class="tag tag--small tag--category">
             {% trans 'Services' %}
-        </div>
-        <div class="tag tag--small dashed dashed--gray dashed--small">
             {{ object.dashboardservice.name }}
+        </div -->
+        <div class="tag tag--small tag--category">
+            {{ object.name }}
         </div>
     </div>
 {% endblock %}

From 6d4be81fbb0b777e4c6487222a0d38d729b1d56c Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Wed, 31 Mar 2021 20:35:36 +0200
Subject: [PATCH 04/11] fixup! fixup! dashboard services front end

---
 .../pages/dashboardservice/includes/dashboard_card.html       | 3 +--
 .../dashboardservice/includes/dashboardservice_card.html      | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
index 711ace42..6cd2f1e4 100644
--- a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
@@ -14,8 +14,7 @@
             {% with object.image as images %}
                 {% if images %}
                     <figure class="dashboardservice-box__image">
-                        <img src="{{ MEDIA_URL }}{% thumbnail images 400 280 %}" data-original="" class="lazyload" />
-                        <!-- img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images 427 286 top=0.5 left=object.photo_alignment|get_photo_alignment %}" class="lazyload" / -->
+                        <img src="{{ MEDIA_URL }}{% thumbnail images 400 280 %}" data-original="" class="lazyload" title="{{ object.url }}"/>
                     </figure>
                 {% else %}
                     <figure class="dashboardservice-box__image">
diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
index 96a21aca..3a8d0f6b 100644
--- a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
@@ -23,10 +23,6 @@
 
 {% block tags %}
     <div class="dashboardservice-box__tags">
-        <!-- div class="tag tag--small tag--category">
-            {% trans 'Services' %}
-            {{ object.dashboardservice.name }}
-        </div -->
         <div class="tag tag--small tag--category">
             {{ object.name }}
         </div>

From 04964cdf2c3e5cf82f3e46607a2dc7fbe1747c0c Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Thu, 1 Apr 2021 18:31:22 +0200
Subject: [PATCH 05/11] Dashboard french translation

---
 ircam_www_theme/locale/fr/LC_MESSAGES/django.po            | 3 +++
 ircam_www_theme/templates/pages/dashboardservice_list.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ircam_www_theme/locale/fr/LC_MESSAGES/django.po b/ircam_www_theme/locale/fr/LC_MESSAGES/django.po
index a6d7f68e..e546ff80 100644
--- a/ircam_www_theme/locale/fr/LC_MESSAGES/django.po
+++ b/ircam_www_theme/locale/fr/LC_MESSAGES/django.po
@@ -1136,3 +1136,6 @@ msgstr "Tweets récents"
 
 #~ msgid "Persons"
 #~ msgstr "Personnes"
+
+#~ msgid "Dashboard"
+#~ msgstr "Tableau de bord"
\ No newline at end of file
diff --git a/ircam_www_theme/templates/pages/dashboardservice_list.html b/ircam_www_theme/templates/pages/dashboardservice_list.html
index ea276ee9..45d31ee6 100644
--- a/ircam_www_theme/templates/pages/dashboardservice_list.html
+++ b/ircam_www_theme/templates/pages/dashboardservice_list.html
@@ -27,7 +27,7 @@
 
 
 {% block page_title %}
-    <h1 class="dotted">{% trans "Services" %}</h1>
+    <h1 class="dotted">{% trans "Dashboard" %}</h1>
 {% endblock %}
 
 {% block page_sidebar %}

From d337b9abbb68db9093d5033433b5749dec920f8b Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Wed, 31 Mar 2021 18:03:58 +0200
Subject: [PATCH 06/11] dashboard services front end

---
 .../modules/boxes/_dashboardservice-box.scss  | 285 ++++++++++++++++++
 .../includes/dashboard_card.html              |  57 ++++
 .../includes/dashboardservice_card.html       |  48 +++
 .../pages/dashboardservice_list.html          |  60 ++++
 4 files changed, 450 insertions(+)
 create mode 100644 ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss
 create mode 100644 ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
 create mode 100644 ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
 create mode 100644 ircam_www_theme/templates/pages/dashboardservice_list.html

diff --git a/ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss b/ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss
new file mode 100644
index 00000000..bd80663b
--- /dev/null
+++ b/ircam_www_theme/static/src/sass/modules/boxes/_dashboardservice-box.scss
@@ -0,0 +1,285 @@
+// -*- coding: utf-8 -*-
+
+// Copyright (c) 2016-2017 Ircam
+// Copyright (c) 2016-2017 Jérémy Fabre
+
+// This file is part of mezzanine-organization.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+$module: ".dashboardservice-box";
+
+#{$module} {
+
+    position: relative;
+    background: white;
+    display: block;
+    @include margin-bottom(1);
+    @include transition(all 0.25s ease-in-out);
+
+    &:hover {
+        box-shadow: 0px 0px 14px 0px rgba(0,0,0,0.17);
+        .dashboardservice-box__image {
+
+            img {
+                @include transform(scale(1.1));
+            }
+
+            &:after {
+                border-width: 12px;
+            }
+        }
+    }
+
+    &__header {
+        position: relative;
+    }
+
+    &__image {
+        margin: 0;
+        padding: 0;
+        width: 100%;
+        position: relative;
+        /*overflow: hidden;*/
+
+        @include fluid-aspect(427 286);
+
+        img {
+            display: block;
+            width: 100%;
+            max-width: 100%;
+            height: auto;
+            @include transition(all 0.3s ease-in-out);
+        }
+
+        &:after {
+            content: '';
+            display: block;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            border-width: 0px;
+            border-color: white;
+            border-style: solid;
+            @include transition(all 0.25s ease-in-out);
+        }
+    }
+
+    &__placeholder {
+
+        background: $color-main;
+
+        &.recherche, &.research {
+            background-color: white;
+            background-image: url(../img/patterns/squares.png);
+            opacity: 0.4;
+        }
+        &.creation {
+            background-color: white;
+            background-image: url(../img/patterns/circles.png);
+            opacity: 0.2;
+        }
+        &.transmission {
+            background-color: white;
+            background-image: url(../img/patterns/stripes.png);
+            opacity: 0.4;
+        }
+        &.innovation, &.innovations {
+            background-color: white;
+            background-image: url(../img/patterns/triangles.png);
+            opacity: 0.2;
+        }
+
+    }
+
+    &__tags {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+
+        @include margin-bottom(.55);
+    }
+
+    &__btn {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+
+        @include margin-bottom(.5);
+        @include margin-right(.5);
+    }
+
+    &__content {
+        @include padding(.25 .25 1 .25);
+
+        position: relative;
+        overflow: hidden;
+
+        @include mq($until: xs) {
+            height: auto;
+        }
+
+        /*&:after {
+
+            @include mq($until: xs) {
+                display: none;
+            }
+
+            content: "";
+            display: block;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            height: 100px;
+            background-color: rgba(255,255,255,0);
+            @include filter-gradient(#ffffff, #ffffff, vertical);
+            @include background-image(linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 50%));
+        }*/
+    }
+
+    &__title {
+        @include font-size(xl);
+        @include line-height(1.25);
+        @include typeface(sans-serif);
+        @include margin(0 0 .25 0);
+    }
+
+    &__subtitle {
+        @include font-size(s);
+        @include line-height(.75);
+        @include typeface(serif);
+        @include margin-top(.25);
+        font-weight: weight(regular);
+
+        .slider-home & {
+
+            @include font-size(m);
+            @include line-height(1);
+            @include typeface(sans-serif);
+            @include margin-top(.25);
+            font-weight: weight(regular);
+
+        }
+
+    }
+
+    &__desc {
+        @include font-size(s);
+        @include line-height(.75);
+        @include typeface(serif);
+        @include margin(1 0 .25 0);
+        font-weight: weight(light);
+    }
+
+    &--small {
+
+        .dashboardservice-box__content {
+            height: auto;
+            &:after {
+                display: none;
+            }
+        }
+
+        .dashboardservice-box__btn {
+            display: none;
+        }
+
+    }
+
+    .slider-home & {
+        display: inline-block;
+        max-width: 450px;
+        background: transparent;
+
+        &__content {
+            background: white;
+            margin-top: 1px;
+        }
+    }
+
+    &--person {
+
+        @include margin-top(2);
+        position: relative;
+
+
+
+        &:after {
+
+            content: "";
+            display: block;
+            height: 1px;
+            width: 100%;
+            background: #979797;
+            position: absolute;
+            bottom: -24px;
+            left: 0;
+            right: 0;
+
+        }
+
+        #{$module}__title {
+
+            @include font-size(xl);
+            @include line-height(1.25);
+            @include typeface(sans-serif);
+            @include margin(.25 0 .25 0);
+            font-weight: weight(heavy);
+
+        }
+
+        #{$module}__image {
+
+            @include fluid-aspect(427 500);
+
+        }
+
+        #{$module}__desc {
+            @include line-height(1);
+        }
+
+        #{$module}__content {
+
+            height: 350px;
+
+            @include mq($until: xs) {
+                height: auto;
+            }
+
+            &:after {
+
+                @include mq($until: xs) {
+                    display: none;
+                }
+
+                content: "";
+                display: block;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                right: 0;
+                height: 100px;
+                background-color: rgba(255,255,255,0);
+                @include filter-gradient(#ffffff, #ffffff, vertical);
+                @include background-image(linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 50%));
+            }
+
+        }
+
+    }
+
+}
diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
new file mode 100644
index 00000000..711ace42
--- /dev/null
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
@@ -0,0 +1,57 @@
+{% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
+
+<a class="dashboardservice-box" href="
+    {% block url %}
+        {{ object.url }}
+    {% endblock %}"
+    {% block target %}
+        {{ object.url }} target="_blank"
+    {% endblock %}
+    title="{% block metatitle %}{{ object.title }}{% endblock %}">
+    <div class="dashboardservice-box__header">
+        {% block image %}
+            <!-- img src="/media/{{object.image}}" / -->
+            {% with object.image as images %}
+                {% if images %}
+                    <figure class="dashboardservice-box__image">
+                        <img src="{{ MEDIA_URL }}{% thumbnail images 400 280 %}" data-original="" class="lazyload" />
+                        <!-- img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images 427 286 top=0.5 left=object.photo_alignment|get_photo_alignment %}" class="lazyload" / -->
+                    </figure>
+                {% else %}
+                    <figure class="dashboardservice-box__image">
+                        {% if object.department %}
+                            <div class="dashboardservice-box__placeholder {{object.department.name|slugify}}"></div>
+                        {% else %}
+                            <div class="dashboardservice-box__placeholder"></div>
+                        {% endif %}
+                    </figure>
+                {% endif %}
+            {% endwith %}
+        {% endblock %}
+
+        {% block tags %}
+        {% endblock %}
+
+        {% block btn %}
+        {% endblock %}
+
+    </div>
+
+    <div class="dashboardservice-box__content tal">
+        <h3 class="dashboardservice-box__title">
+            {% block title %}
+                {{ object.title }}
+            {% endblock %}
+        </h3>
+        <div class="dashboardservice-box__subtitle">
+            {% block subtitle %}
+                {{ object.sub_title }}
+            {% endblock %}
+        </div>
+        <div class="dashboardservice-box__desc">
+            {% block content %}
+                {{ object.description|richtext_filters|safe|truncatechars_html:200 }}
+            {% endblock %}
+        </div>
+    </div>
+</a>
diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
new file mode 100644
index 00000000..09d9995f
--- /dev/null
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
@@ -0,0 +1,48 @@
+{% extends "pages/dashboardservice/includes/dashboard_card.html" %}
+{% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
+
+{% block metatitle %}
+    {{ block.super }}
+{% endblock %}
+
+{% block title %}
+    {{ block.super }}
+{% endblock %}
+
+{% block url %}
+    {{ block.super }}
+{% endblock %}
+
+{% block target %}
+    {{ block.super }}
+{% endblock %}
+
+{% block image %}
+    {{ block.super }}
+{% endblock %}
+
+{% block tags %}
+    <div class="dashboardservice-box__tags">
+        <div class="tag tag--small tag--category">
+            {% trans 'Services' %}
+        </div>
+        <div class="tag tag--small dashed dashed--gray dashed--small">
+            {{ object.dashboardservice.name }}
+        </div>
+    </div>
+{% endblock %}
+
+{% block content %}
+    {{ block.super }}
+{% endblock %}
+
+{% block subtitle %}
+    {% comment %}
+        {{ object.publish_date|date:"DATE_FORMAT" }}
+    {% endcomment %}
+    {% for category in object.categories.all %}
+        {% comment %}{% if forloop.first %} | {% endif %}{% endcomment %}
+        {% if not forloop.first %}, {% endif %}
+        <strong>{{ category }}</strong>
+    {% endfor %}
+{% endblock %}
diff --git a/ircam_www_theme/templates/pages/dashboardservice_list.html b/ircam_www_theme/templates/pages/dashboardservice_list.html
new file mode 100644
index 00000000..ea276ee9
--- /dev/null
+++ b/ircam_www_theme/templates/pages/dashboardservice_list.html
@@ -0,0 +1,60 @@
+{% extends "pages/page.html" %}
+{% load i18n  mezzanine_tags event_tags keyword_tags disqus_tags organization_tags staticfiles pages_tags %}
+
+{% block meta_title %}
+    {% if page %}
+        {{ page.title }}
+    {% else %}
+        {% trans "News" %}
+    {% endif %}
+{% endblock %}
+
+{% block meta_keywords %}
+    {% metablock %}
+        {% keywords_for page as keywords %}
+        {% for keyword in keywords %}
+            {% if not forloop.first %}, {% endif %}
+            {{ keyword }}
+        {% endfor %}
+    {% endmetablock %}
+{% endblock %}
+
+{% block meta_description %}
+    {% metablock %}
+        {{ page.description }}
+    {% endmetablock %}
+{% endblock %}
+
+
+{% block page_title %}
+    <h1 class="dotted">{% trans "Services" %}</h1>
+{% endblock %}
+
+{% block page_sidebar %}
+    <ul class="nav-tree nav-tree--level-0" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
+        {% for keyword in keywords %}
+            <li class="nav-tree__item">
+                {% if current_keyword_slug == keyword.keyword.slug %}
+                    <a href="{% url 'dashboard-service-list' %}" class="nav-tree__link nav-tree__link--filter active" title="">{{ keyword }}<i class="fa fa-times"></i></a>    
+                {% else %}
+                    <a href="{% url 'dashboard-service-list' keyword=keyword.keyword.slug %}" class="nav-tree__link nav-tree__link--filter" title="">{{ keyword }}</a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+{% endblock %}
+
+{% block page_content %}
+
+    {% for object in objects %}
+        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-6">
+            {% with app_label=object|app_label_short classname=object|classname|lower  %}
+                {% with app_label|add:"/"|add:classname|add:"/includes/"|add:classname|add:"_card.html" as template %}
+                    {% include template %}
+                {% endwith %}
+            {% endwith %}
+        </div>
+    {% endfor %}
+
+    {% pagination_for objects %}
+{% endblock %}

From 288e7869d98600dfdaa9a657a596de4bb9a1b8cb Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Wed, 31 Mar 2021 19:27:44 +0200
Subject: [PATCH 07/11] fixup! dashboard services front end

---
 .../dashboardservice/includes/dashboardservice_card.html   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
index 09d9995f..96a21aca 100644
--- a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
@@ -23,11 +23,12 @@
 
 {% block tags %}
     <div class="dashboardservice-box__tags">
-        <div class="tag tag--small tag--category">
+        <!-- div class="tag tag--small tag--category">
             {% trans 'Services' %}
-        </div>
-        <div class="tag tag--small dashed dashed--gray dashed--small">
             {{ object.dashboardservice.name }}
+        </div -->
+        <div class="tag tag--small tag--category">
+            {{ object.name }}
         </div>
     </div>
 {% endblock %}

From 13e12ef1217595fb41d342af38d5f64b671dd847 Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Wed, 31 Mar 2021 20:35:36 +0200
Subject: [PATCH 08/11] fixup! fixup! dashboard services front end

---
 .../pages/dashboardservice/includes/dashboard_card.html       | 3 +--
 .../dashboardservice/includes/dashboardservice_card.html      | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
index 711ace42..6cd2f1e4 100644
--- a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboard_card.html
@@ -14,8 +14,7 @@
             {% with object.image as images %}
                 {% if images %}
                     <figure class="dashboardservice-box__image">
-                        <img src="{{ MEDIA_URL }}{% thumbnail images 400 280 %}" data-original="" class="lazyload" />
-                        <!-- img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-original="{{ MEDIA_URL }}{% thumbnail images 427 286 top=0.5 left=object.photo_alignment|get_photo_alignment %}" class="lazyload" / -->
+                        <img src="{{ MEDIA_URL }}{% thumbnail images 400 280 %}" data-original="" class="lazyload" title="{{ object.url }}"/>
                     </figure>
                 {% else %}
                     <figure class="dashboardservice-box__image">
diff --git a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
index 96a21aca..3a8d0f6b 100644
--- a/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
+++ b/ircam_www_theme/templates/pages/dashboardservice/includes/dashboardservice_card.html
@@ -23,10 +23,6 @@
 
 {% block tags %}
     <div class="dashboardservice-box__tags">
-        <!-- div class="tag tag--small tag--category">
-            {% trans 'Services' %}
-            {{ object.dashboardservice.name }}
-        </div -->
         <div class="tag tag--small tag--category">
             {{ object.name }}
         </div>

From 603857d2e273ebc6d9266ba7a30fb73c3967e563 Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Thu, 1 Apr 2021 18:31:22 +0200
Subject: [PATCH 09/11] Dashboard french translation

---
 ircam_www_theme/locale/fr/LC_MESSAGES/django.po            | 3 +++
 ircam_www_theme/templates/pages/dashboardservice_list.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ircam_www_theme/locale/fr/LC_MESSAGES/django.po b/ircam_www_theme/locale/fr/LC_MESSAGES/django.po
index a6d7f68e..e546ff80 100644
--- a/ircam_www_theme/locale/fr/LC_MESSAGES/django.po
+++ b/ircam_www_theme/locale/fr/LC_MESSAGES/django.po
@@ -1136,3 +1136,6 @@ msgstr "Tweets récents"
 
 #~ msgid "Persons"
 #~ msgstr "Personnes"
+
+#~ msgid "Dashboard"
+#~ msgstr "Tableau de bord"
\ No newline at end of file
diff --git a/ircam_www_theme/templates/pages/dashboardservice_list.html b/ircam_www_theme/templates/pages/dashboardservice_list.html
index ea276ee9..45d31ee6 100644
--- a/ircam_www_theme/templates/pages/dashboardservice_list.html
+++ b/ircam_www_theme/templates/pages/dashboardservice_list.html
@@ -27,7 +27,7 @@
 
 
 {% block page_title %}
-    <h1 class="dotted">{% trans "Services" %}</h1>
+    <h1 class="dotted">{% trans "Dashboard" %}</h1>
 {% endblock %}
 
 {% block page_sidebar %}

From cd375aee5d983550b22a61041cc6b2a766220ac9 Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Thu, 8 Apr 2021 14:25:31 +0200
Subject: [PATCH 10/11] no pagination

---
 ircam_www_theme/templates/pages/dashboardservice_list.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ircam_www_theme/templates/pages/dashboardservice_list.html b/ircam_www_theme/templates/pages/dashboardservice_list.html
index 45d31ee6..ff284082 100644
--- a/ircam_www_theme/templates/pages/dashboardservice_list.html
+++ b/ircam_www_theme/templates/pages/dashboardservice_list.html
@@ -56,5 +56,4 @@ <h1 class="dotted">{% trans "Dashboard" %}</h1>
         </div>
     {% endfor %}
 
-    {% pagination_for objects %}
 {% endblock %}

From da7067c5fc74d0a8bf1e4c975264842927c2bad1 Mon Sep 17 00:00:00 2001
From: drrr-deudeu <denis.rouiller@gmail.com>
Date: Fri, 16 Apr 2021 11:55:56 +0200
Subject: [PATCH 11/11] dashboard side bar

---
 .../pages/dashboardservice_list.html          | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/ircam_www_theme/templates/pages/dashboardservice_list.html b/ircam_www_theme/templates/pages/dashboardservice_list.html
index ff284082..545ed985 100644
--- a/ircam_www_theme/templates/pages/dashboardservice_list.html
+++ b/ircam_www_theme/templates/pages/dashboardservice_list.html
@@ -25,25 +25,10 @@
     {% endmetablock %}
 {% endblock %}
 
-
 {% block page_title %}
     <h1 class="dotted">{% trans "Dashboard" %}</h1>
 {% endblock %}
 
-{% block page_sidebar %}
-    <ul class="nav-tree nav-tree--level-0" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
-        {% for keyword in keywords %}
-            <li class="nav-tree__item">
-                {% if current_keyword_slug == keyword.keyword.slug %}
-                    <a href="{% url 'dashboard-service-list' %}" class="nav-tree__link nav-tree__link--filter active" title="">{{ keyword }}<i class="fa fa-times"></i></a>    
-                {% else %}
-                    <a href="{% url 'dashboard-service-list' keyword=keyword.keyword.slug %}" class="nav-tree__link nav-tree__link--filter" title="">{{ keyword }}</a>
-                {% endif %}
-            </li>
-        {% endfor %}
-    </ul>
-{% endblock %}
-
 {% block page_content %}
 
     {% for object in objects %}
@@ -55,5 +40,29 @@ <h1 class="dotted">{% trans "Dashboard" %}</h1>
             {% endwith %}
         </div>
     {% endfor %}
+{% endblock %}
+
+{% block page_sidebar %}
+    {% if user.is_authenticated %}
+        {% get_pages_in_menu menu_person_id as menu_login_logout %}
+        {% for page in menu_login_logout %}
+            {% if forloop.first %}
+                <ul class="nav-tree nav-tree--level-{{ branch_level }}" data-sticky data-sticky-parent="page" data-sticky-offset="100" data-sticky-detach-at="971">
+            {% endif %}
+            {% if not page.parent %}
+                <li class="nav-tree__item">
+                    <a class="nav-tree__link{% if page.is_current %} active{% endif %}" href="{{ page.get_absolute_url }}">{{ page.title }}</a>
+                </li>
+            {% endif %}
+            {% if forloop.last %}
+                </ul>
+            {% endif %}
+        {% endfor %}
+    {% endif %}
 
 {% endblock %}
+
+{% block page_related_content %}
+   {% include "core/inc/related_content_dynamic.html" %}
+{% endblock %}
+