corpus carre vide et plus petit

hover audio link -> node_popup on map
index sort title
corpus map : white safety zone arround squares
aside squares not collisioning
square faded not interactive (article filtre)
node_popup show chutier icon only if action not add
fade not active entries in entrees block
closing notice|index doesn't close entree on block
and many little things

sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js

@@ -25,7 +25,8 @@
     var _canvas = _$canvas[0];
     var _ctx = _canvas.getContext('2d');
     var _canvas_props = {
-      'margin_top':90,
+      // 'margin_top':90, // with red border on head
+      'margin_top':75, // without red border on head
       'margin_right':0,
       'margin_bottom':65,
       'margin_left':0
@@ -206,13 +207,13 @@
       // define radius regarding entries length
       switch(true){
         case this.entrees.length > 3:
-          this.r = 10;
+          this.r = 8;//10;
           break;
         case this.entrees.length > 1 && this.entrees.length <= 3:
-          this.r = 7;
+          this.r = 5;//7;
           break;
         default:
-          this.r = 4;
+          this.r = 3;//4;
           break;
       }
 
@@ -225,7 +226,8 @@
       this.aside = false;
       this.scrambling = false;
 
-      this.n_repulses = {};
+      this.wall_bouncing_elasticity = 0.75;
+      // this.n_repulses = {};
 
       // prototypes
       if (typeof Node.initialized == "undefined") {
@@ -300,7 +302,7 @@
             }
           }
 
-          if(_mouse_in && !this.aside)
+          if(_mouse_in && !this.aside && !this.faded)
             this.checkMouse();
 
           // if(this.debug)
@@ -322,19 +324,27 @@
           switch(true){
             case this.x < this.wall_limits.left && this.p.velocity.x < 0:
               this.p.position.x = this.wall_limits.left;
-              this.p.velocity.multiplyScalarXY(-1, 1).multiplyScalar(0.75);
+              this.p.velocity
+                .multiplyScalarXY(-1, 1)
+                .multiplyScalar(this.wall_bouncing_elasticity);
               break;
             case this.x > this.wall_limits.right && this.p.velocity.x > 0:
               this.p.position.x = this.wall_limits.right;
-              this.p.velocity.multiplyScalarXY(-1, 1).multiplyScalar(0.75);
+              this.p.velocity
+                .multiplyScalarXY(-1, 1)
+                .multiplyScalar(this.wall_bouncing_elasticity);
               break;
             case this.y < this.wall_limits.top && this.p.velocity.y < 0 :
               this.p.position.y = this.wall_limits.top;
-              this.p.velocity.multiplyScalarXY(1,-1).multiplyScalar(0.75);
+              this.p.velocity
+                .multiplyScalarXY(1,-1)
+                .multiplyScalar(this.wall_bouncing_elasticity);
               break;
             case this.y > this.wall_limits.bottom && this.p.velocity.y > 0 :
               this.p.position.y = this.wall_limits.bottom;
-              this.p.velocity.multiplyScalarXY(1,-1).multiplyScalar(0.75);
+              this.p.velocity
+                .multiplyScalarXY(1,-1)
+                .multiplyScalar(this.wall_bouncing_elasticity);
               break;
           }
         };
@@ -352,16 +362,23 @@
            && _m_pos.y < this.y + this.r){
             if(_node_hover_id == -1 || _node_hover_id !== this.id){
               // console.log("Node hover", this.id);
-              this.hover = true;
-              _node_hover_id = this.id;
-              _node_pop_up.setNode(this);
+              this.setHover();
             }
           }else{
-            this.hover = false;
-            if (_node_hover_id == this.id) {
-              _node_hover_id = -1;
-              _node_pop_up.removeNode();
-            }
+            this.unsetHover();
+          }
+        };
+
+        Node.prototype.setHover = function(){
+          this.hover = true;
+          _node_hover_id = this.id;
+          _node_pop_up.setNode(this);
+        };
+        Node.prototype.unsetHover = function(){
+          this.hover = false;
+          if (_node_hover_id == this.id) {
+            _node_hover_id = -1;
+            _node_pop_up.removeNode();
           }
         };
 
@@ -421,12 +438,14 @@
           this.unsetCentered();
           this.ori_p.position.x = this.x < _canvas.width /2 ? this.wall_limits.left : this.wall_limits.right;
           this.ori_p_attract.on = true;
+          this.wall_bouncing_elasticity = 0.15;
         }
         Node.prototype.unsetAside = function(){
           console.log('unsetAside');
           this.aside = false;
           this.ori_p_attract.on = false;
           this.ori_p.position.x = this.ori_pos.x;
+          this.wall_bouncing_elasticity = 0.75;
           // this.unFade();
         }
 
@@ -464,15 +483,25 @@
           // actif entouré de rouge
 
           _ctx.beginPath();
-          _ctx.globalAlpha = this.faded ? 0.1 : 1;
-          // _ctx.fillStyle = !this.p.resting() ? _ecolors[this.e_color] : 'rgb(0, 0, 0)';
-          _ctx.fillStyle = _ecolors[this.e_color];
+          _ctx.globalAlpha = this.faded ? 0.15 : 1;
+          // carre plein
+          // _ctx.fillStyle = _ecolors[this.e_color];
+          // _ctx.fillRect(this.x - this.r,this.y - this.r,this.r*2,this.r*2);
+          // ou carre contour
+          _ctx.lineWidth = '2px';
+          _ctx.fillStyle = 'rgb(255,255,255)';
           _ctx.fillRect(this.x - this.r,this.y - this.r,this.r*2,this.r*2);
+          _ctx.strokeStyle = _ecolors[this.e_color];
+          _ctx.strokeRect(this.x - this.r,this.y - this.r,this.r*2,this.r*2);
 
           if(this.opened){
-            _ctx.lineWidth = '1px';
-            _ctx.strokeStyle = 'rgb(255,0,0)';
-            _ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
+            // carre plein
+            // _ctx.lineWidth = '1px';
+            // _ctx.strokeStyle = 'rgb(255,0,0)';
+            // _ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
+            // ou carre contour
+            _ctx.fillStyle = _ecolors[this.e_color];
+            _ctx.fillRect(this.x - this.r,this.y - this.r,this.r*2,this.r*2);
           }
           _ctx.globalAlpha = 1;
           _ctx.closePath();
@@ -507,7 +536,8 @@
           nb = _nodes[q];
           mb = nb.p.mass;
           // avoid impact between center and aside particules
-          if((na.center && nb.aside) || (na.aside && nb.center))
+          // and between aside particules
+          if((na.center && nb.aside) || (na.aside && nb.center) || (na.aside && nb.aside))
             continue;
 
           // avoid impact between two centered particulses that comes to the center
@@ -518,6 +548,9 @@
           }
 
           w = h = (na.r+nb.r);
+          // if(!na.aside && !nb.aside){
+            w = h += 4; // add a saftey zone around squares eccept for aside squares
+          // }
           dx = na.p.position.x - nb.p.position.x;
           dy = na.p.position.y - nb.p.position.y;
 
@@ -624,6 +657,7 @@
       if(!$li.is('.opened')){
         _$entrees_block_termlinks.parents('li').removeClass('opened');
         $li.addClass('opened');
+        $li.parents('.item-list').addClass('opened')
         filterEntree(tid);
         if(bubbling){
           _$body.trigger({'type':'open_entree', 'tid':tid, 'url':url, 'sys_path':sys_path});
@@ -631,6 +665,7 @@
       // bubbling is true only when event is a real click on entree link
       }else if(bubbling){
         $li.removeClass('opened');
+        $li.parents('.item-list').removeClass('opened')
         scrambleCollection();
         _$body.trigger({'type':'close_entree', 'tid':tid});
       }
@@ -651,7 +686,9 @@
       createNodesRepulsions();
     };
     function highlightEntries(){
-      _$entrees_block_termlinks.removeClass('highlighted');
+      _$entrees_block_termlinks
+        .parents('li').removeClass('highlighted')
+        .parents('.item-list').removeClass('highlighted');
       var id = -1;
       if(_node_hover_id != -1){
         id = _node_hover_id;
@@ -664,7 +701,8 @@
           entree = _nodes[id].entrees[i];
           _$entrees_block_termlinks.filter(function(){
             return $(this).attr('tid') == entree;
-          }).addClass('highlighted');
+          }).parents('li').addClass('highlighted')
+            .parents('.item-list').addClass('highlighted');
         }
       }
     };
@@ -802,6 +840,18 @@
             }
           }
         })
+        .on('mouseover-audio-link', function(e){
+          console.log("Corpus on mouseover-audio-link", e);
+          // _node_hover_id = _nodes_Nid_Id[e.nid];
+          // _node_pop_up.setNode(_nodes_by_nid[e.nid]);
+          _nodes_by_nid[e.nid].setHover();
+        })
+        .on('mouseout-audio-link', function(e){
+          console.log("Corpus on mouseover-audio-link", e);
+          // _node_hover_id = -1;
+          // _node_pop_up.removeNode();
+          _nodes_by_nid[e.nid].unsetHover();
+        })
         .on('audio-node-opened', function(e){
           // console.log('Corpus audio-node-opened', e);
           openNodeByNid(e.nid);
@@ -852,8 +902,12 @@
         })
         .on('new-content-not-entree-ajax-loaded', function(e){
           // close all entries only if entry already opened
+          // TODO: user the function close all entries ?
+          // closeAllEntries(); not working, is closing also the ajax loaded content
           if(_$entrees_block_termlinks.parents('li.opened').length){
-            _$entrees_block_termlinks.parents('li').removeClass('opened');
+            _$entrees_block_termlinks
+              .parents('li').removeClass('opened')
+              .parents('.item-list').removeClass('opened');
             scrambleCollection();
           }
         });
@@ -863,7 +917,8 @@
       _$entrees_block.find('li.entree').each(function(index, el) {
         var $li = $(this);
         if($('a.is-active', $li).length){
-          $li.addClass('opened');
+          $li.addClass('opened')
+            .parents('.item-list').addClass('opened');
           filterEntree($li.attr('tid'));
           return false;
         }

sites/all/modules/figli/edlp_corpus/assets/styles/corpus.scss

@@ -34,7 +34,7 @@ div.node-popup{
   pointer-events: none;
 
   .inner{
-    padding:0.4em;
+    padding:0.6em;
     outline: 1px solid red;
     background-color: white;
   }

sites/all/modules/figli/edlp_corpus/edlp_corpus.module

@@ -63,6 +63,7 @@ function edlp_corpus_taxonomy_term_view(array &$build, EntityInterface $entity,
     $query = \Drupal::entityQuery('node')
       ->condition('status', 1)
       ->condition('type', 'enregistrement')
+      ->sort('title')
       ->condition('field_entrees', $entity->id());
 
     $documents_nids = $query->execute();

sites/all/themes/custom/edlptheme/assets/dist/scripts/history.min.js

@@ -1,2 +1,20 @@
+console.log('EDLP THEME HISTORY.js');
+// var edlp is provided by edlp_ajax.module file
+if(edlp.redirect){
+  console.log('history redirect', edlp);
+  console.log('window.location', window.location);
+  // window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));
+  edlp.sys_path = edlp.sys_path.replace(/^\//, '');
 
-void 0;if(edlp.redirect){void 0;void 0;edlp.sys_path=edlp.sys_path.replace(/^\//,'');edlp.url=window.location.pathname;edlp.hash=window.location.hash;window.localStorage.setItem('edlp_origin',JSON.stringify(edlp));window.location.replace(window.location.origin+'/'+edlp.lang_code);}else{void 0;}
+  // window.localStorage.setItem('edlp_origin_url', window.location.pathname);
+  edlp.url = window.location.pathname;
+
+  // window.localStorage.setItem('edlp_origin_hash', window.location.hash);
+  edlp.hash = window.location.hash;
+
+  window.localStorage.setItem('edlp_origin', JSON.stringify(edlp));
+  // redirect to home
+  window.location.replace(window.location.origin+'/'+edlp.lang_code);
+}else{
+  console.log('history do not redirect');
+}

sites/all/themes/custom/edlptheme/assets/scripts/main.js

@@ -81,7 +81,9 @@
             history.pushState(state, null, e.url);
           }
         })
-        .on('close_entree', backToFrontPage);
+        .on('close_entree', function(e){
+          backToFrontPage();
+        });
     }
 
     //  ___             _ _ ___
@@ -203,8 +205,10 @@
 
       if(typeof state.selector != 'undefined'){
         // in case of entree link (actualy, selector is used only for entries links)
+        // TODO:  unfortunatly on initFirstLoad there is no selector property
         console.log('selector', state.selector);
         $('a[selector="'+state.selector+'"]').addClass('is-active');
+        initAudioLinksInContent();
       }else{
         if(typeof state.view_mode != 'undefined'){
           $('a[viewmode="'+state.view_mode+'"][data-drupal-link-system-path="'+state.sys_path+'"]').addClass('is-active');
@@ -297,6 +301,31 @@
       }
     };
 
+    function initAudioLinksInContent(){
+      // console.log('initAudioLinksInContent');
+      _$row.find('a.audio-link')
+        .on('mouseover', function(event) {
+          event.preventDefault();
+          // console.log('onmouseover audio-link');
+          if(_corpus_ready){
+            _$corpus_canvas.trigger({
+              type:'mouseover-audio-link',
+              nid:$(this).attr('nid')
+            });
+          }
+        })
+        .on('mouseout', function(event) {
+          event.preventDefault();
+          // console.log('onmouseout audio-link');
+          if(_corpus_ready){
+            _$corpus_canvas.trigger({
+              type:'mouseout-audio-link',
+              nid:$(this).attr('nid')
+            });
+          }
+        });
+    };
+
     function addCloseModalBtnToCols(){
       $('.col', _$row).each(function(index, el) {
 
@@ -305,25 +334,28 @@
 
         $(this).children('.wrapper').prepend($('<span>')
           .addClass('close-col-btn')
-          .on('click', function(e){
-            // check for theme attribute and emmit event
-            var $col = $(this).parents('.col');
-            var theme = $col.attr('theme');
-            if(theme != ''){
-              _$body.trigger({'type':theme+'-col-closed'});
-            }
-            // remove the col
-            $col.remove();
-            // if row is empty and we are not in productions call closeAllModals()
-            if(!$('.col', _$row).length
-              && !_$body.is('.entity-type-node.bundle-page')){
-                backToFrontPage();
-            }
-          })
+          .on('click', onCloseModal)
         );
       });
     };
 
+    function onCloseModal(e){
+      // check for theme attribute and emmit event
+      var $col = $(this).parents('.col');
+      var theme = $col.attr('theme');
+      if(theme != ''){
+        _$body.trigger({'type':theme+'-col-closed'});
+      }
+      // remove the col
+      $col.remove();
+      // if row is empty and we are not in productions or entree notice|index call closeAllModals()
+      if(!$('.col', _$row).length
+        && !_$body.is('.entity-type-node.bundle-page')
+        && !_$body.is('.entity-type-taxonomy_term.bundle-entrees')){
+          backToFrontPage();
+      }
+    };
+
     //    _    _            ___ _         _
     //   /_\  (_)__ ___ __ | _ ) |___  __| |__ ___
     //  / _ \ | / _` \ \ / | _ \ / _ \/ _| / /(_-<
@@ -367,37 +399,47 @@
 
       // var origin_sys_path = window.localStorage.getItem('edlp_origin_path');
       var edlp_origin = JSON.parse(window.localStorage.getItem('edlp_origin'));
+      console.log('edlp_origin', edlp_origin);
 
       if(edlp_origin != null && edlp_origin.sys_path){
-        // var origin_url = window.localStorage.getItem('edlp_origin_url');
-        // origin_hash is used as viewmode for taxonomy term entrees load (index or notice)
-        // var origin_hash = window.localStorage.getItem('edlp_origin_hash');
+        // hash is used as viewmode for taxonomy term entrees load (index or notice)
+        // and for audio contents (article|transcript)
         var view_mode = edlp_origin.hash.replace('#', '');
 
-        // // TODO: refactorize with new infos from edlp_origin
-        if(view_mode){
-          var $link = $('[href="'+edlp_origin.url+'"][viewmode="'+view_mode+'"]');
-          var selector = $link.attr('selector') || null;
-          if(selector){
+        // create history state
+        var state = getSysPathState(edlp_origin.sys_path, view_mode);
+
+        // open entree tray in case of entree index|notice
+        // (index or notice will be opened with ajaxLoadContent)
+        // refactorized with new infos from edlp_origin
+        // if(view_mode){
+        if(edlp_origin.entity_type == "taxonomy_term"
+            && edlp_origin.entity_bundle == "entrees"
+            && view_mode){
+          // var $link = $('[href="'+edlp_origin.url+'"][viewmode="'+view_mode+'"]');
+          // var selector = $link.attr('selector') || null;
+
+          // record the selector in the state for actions after ajaxContentLoaded
+          state.selector = 'entree-'+view_mode+'-link-'+edlp_origin.entity_id; // entree-index-link-125
+          // if(selector){
             // in case of entree link (actualy, selector is used only for entries links)
             // TODO: use a promise
+            // TODO: but what if corpus ready before onAjaxLoaded >> use a promise !!
             if(_corpus_ready){
               _$corpus_canvas.trigger({
                 type:'open-entree',
-                tid:$link.attr('tid')
+                // tid:$link.attr('tid')
+                tid:edlp_origin.entity_id
               });
             }else{
               // else : EdlpCorpus will check when ready if entry item (notice or index) is already .is-active
               // .is-active class is added by onAjaxLoaded() (when content is loaded)
-              // but what if corpus ready before onAjaxLoaded >> use a promise !!
-              $('li.entree[tid="'+$link.attr('tid')+'"] a.term-link').addClass('is-active');
+              // $('li.entree[tid="'+$link.attr('tid')+'"] a.term-link').addClass('is-active');
+              $('li.entree[tid="'+edlp_origin.entity_id+'"] a.term-link').addClass('is-active');
             }
-          }
+          // }
         }
 
-        // create history state
-        var state = getSysPathState(edlp_origin.sys_path, view_mode);
-
         // check if audio link
         if(edlp_origin.audio_url){
           var node = {
@@ -1205,13 +1247,16 @@
     // |_||_| \___/_||_\__|_| \__,_\__, \___|
     //                             |___/
     function backToFrontPage(pop_state){
+      console.log('backToFrontPage', pop_state);
       closeAllModals();
       // assume we are going back to front page
       $('body').removeClass().addClass('path-frontpage');
       $('a[data-drupal-link-system-path="<front>"]').addClass('is-active');
       // close entrees
       _$corpus_canvas.trigger({'type':'close-all-entree'});
-      if(!pop_state){
+
+      if(typeof pop_state == "undefined" || !pop_state){
+        console.log('backToFrontPage push state');
         history.pushState({home:true}, null, drupalSettings.path.baseUrl+drupalSettings.path.currentLanguage);
       }
     }

sites/all/themes/custom/edlptheme/assets/styles/app.scss

@@ -339,9 +339,12 @@ main[role="main"]{
   }
 
   div.taxonomy-term{
-    >h2{display:none;}
+    >h2{
+      // display:none;
+      @include content_subtitles;
+      margin: 1em 0 0.5em;
+    }
     >.content{
-      margin-top: 1em;
     }
     .field__label{
       @include content_titles;
@@ -1537,185 +1540,195 @@ footer{
 
     display: inline-block;
     // vertical-align: top;
-    ul{
-      margin:0;
-      white-space: nowrap;
-      li{
-        @include oblique-list;
+    div.item-list{
+      ul{
         margin:0;
         white-space: nowrap;
-        pointer-events: none;
-        span.oblique-wrapper{
-          height:120px; // this is needed to respect the height of oblique links :(
-          display: inline-block;
-          vertical-align: bottom;
-          position: relative;
-          width:1.5em;
-        }
-
-        a.term-link, a.articles-link{
-          // outline: 1px solid blue;
-          pointer-events: all;
-          background-color: #fff;
-          padding-right: 0.4em;
-          &:before{
-            content: "";
-            display:inline-block;
-            $sq:7px;
-            width: $sq; height:$sq;
-            border: 1px solid #000;
-            background-color: #000;
-            margin-right: 0.5em;
-            transition: background-color 0.1s ease-in-out;
-          }
-
-          &.articles-link{
-            margin-left: 4em;
-            text-transform: capitalize;
+        li{
+          @include oblique-list;
+          margin:0;
+          white-space: nowrap;
+          pointer-events: none;
+          span.oblique-wrapper{
+            height:120px; // this is needed to respect the height of oblique links :(
+            display: inline-block;
+            vertical-align: bottom;
+            position: relative;
+            width:1.5em;
           }
-        }
 
-        .entree-content{
-          display: inline-block;
-          // outline: 1px solid green;
-          width:0;
-          overflow: hidden;
-          opacity: 0;
-          transition: all 300ms ease-in-out;
-          transition-property: width,opacity;
-          span.oblique-wrapper:first-of-type{
-            margin-left: 0.5em;
-          }
-          span.oblique-wrapper a{
-            text-transform: none;
-            pointer-events: auto;
+          a.term-link, a.articles-link{
+            // outline: 1px solid blue;
+            pointer-events: all;
+            // background-color: #fff;
+            background-color: rgba(255,255,255, 0.6);
+            padding-right: 0.4em;
+            color:black;
+            transition: color 0.3s ease-in-out;
             &:before{
               content: "";
               display:inline-block;
-              $sq:5px;
+              $sq:7px;
               width: $sq; height:$sq;
               border: 1px solid #000;
+              background-color: #000;
               margin-right: 0.5em;
+              transition: background-color 0.1s ease-in-out;
             }
-            &.ajax-loading:before{
-              @include spining-loader-square;
+
+            &.articles-link{
+              margin-left: 4em;
+              text-transform: capitalize;
             }
           }
-          .term-description{
+
+          .entree-content{
             display: inline-block;
-            margin-left: 1.5em;
-            text-align: left;
-            width:250px;
-            word-wrap:break-word;
-            // word-break:break-all;
-            hyphens: auto;
-            white-space: normal;
-            background-color: $transparent-bg;
-            padding:0.5em;
-            padding-bottom:0;
-            p{
-              font-size: 0.65em;
-              margin:0;
+            // outline: 1px solid green;
+            width:0;
+            overflow: hidden;
+            opacity: 0;
+            transition: all 300ms ease-in-out;
+            transition-property: width,opacity;
+            span.oblique-wrapper:first-of-type{
+              margin-left: 0.5em;
+            }
+            span.oblique-wrapper a{
+              text-transform: none;
+              pointer-events: auto;
+              &:before{
+                content: "";
+                display:inline-block;
+                $sq:5px;
+                width: $sq; height:$sq;
+                border: 1px solid #000;
+                margin-right: 0.5em;
+              }
+              &.ajax-loading:before{
+                @include spining-loader-square;
+              }
+            }
+            .term-description{
+              display: inline-block;
+              margin-left: 1.5em;
+              text-align: left;
+              width:250px;
+              word-wrap:break-word;
+              // word-break:break-all;
+              hyphens: auto;
+              white-space: normal;
+              background-color: $transparent-bg;
+              padding:0.5em;
+              padding-bottom:0;
+              p{
+                font-size: 0.65em;
+                margin:0;
+              }
             }
           }
-        }
 
-        // TODO: replace variable system by attribute color
-        // a.term-link:before, .entree-content span.oblique-wrapper a:before{
-        //   border-color: attr(color);
-        //   background-color: attr(color);
-        // }
-
-        &[tid='134']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-134);background-color: var(--e-col-134);}}
-        &[tid='121']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-121);background-color: var(--e-col-121);}}
-        &[tid='125']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-125);background-color: var(--e-col-125);}}
-        &[tid='119']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-119);background-color: var(--e-col-119);}}
-        &[tid='132']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-132);background-color: var(--e-col-132);}}
-        &[tid='122']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-122);background-color: var(--e-col-122);}}
-        &[tid='129']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-129);background-color: var(--e-col-129);}}
-        &[tid='120']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-120);background-color: var(--e-col-120);}}
-        &[tid='130']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-130);background-color: var(--e-col-130);}}
-        &[tid='118']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-118);background-color: var(--e-col-118);}}
-        &[tid='127']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-127);background-color: var(--e-col-127);}}
-        &[tid='133']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-133);background-color: var(--e-col-133);}}
-        &[tid='128']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-128);background-color: var(--e-col-128);}}
-        &[tid='124']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-124);background-color: var(--e-col-124);}}
-        &[tid='116']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-116);background-color: var(--e-col-116);}}
-        &[tid='117']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-117);background-color: var(--e-col-117);}}
-        &[tid='131']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-131);background-color: var(--e-col-131);}}
-        &[tid='126']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-126);background-color: var(--e-col-126);}}
-        &[tid='123']{
-          a.term-link:before, .entree-content span.oblique-wrapper a:before{
-            border-color: var(--e-col-123);background-color: var(--e-col-123);}}
-
-        // &.highlighted{
-        //   a.term_link{
-        //     color: red;
-        //   }
-        // }
-        .entree-content span.oblique-wrapper a:not(:hover):not(.is-active):before{background-color: #fff!important;}
-
-        a.articles-link:not(:hover):not(.is-active):before{
-          background-color: #fff!important;
-        }
+          // TODO: replace variable system by attribute color
+          // a.term-link:before, .entree-content span.oblique-wrapper a:before{
+          //   border-color: attr(color);
+          //   background-color: attr(color);
+          // }
 
+          &[tid='134']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-134);background-color: var(--e-col-134);}}
+          &[tid='121']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-121);background-color: var(--e-col-121);}}
+          &[tid='125']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-125);background-color: var(--e-col-125);}}
+          &[tid='119']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-119);background-color: var(--e-col-119);}}
+          &[tid='132']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-132);background-color: var(--e-col-132);}}
+          &[tid='122']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-122);background-color: var(--e-col-122);}}
+          &[tid='129']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-129);background-color: var(--e-col-129);}}
+          &[tid='120']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-120);background-color: var(--e-col-120);}}
+          &[tid='130']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-130);background-color: var(--e-col-130);}}
+          &[tid='118']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-118);background-color: var(--e-col-118);}}
+          &[tid='127']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-127);background-color: var(--e-col-127);}}
+          &[tid='133']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-133);background-color: var(--e-col-133);}}
+          &[tid='128']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-128);background-color: var(--e-col-128);}}
+          &[tid='124']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-124);background-color: var(--e-col-124);}}
+          &[tid='116']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-116);background-color: var(--e-col-116);}}
+          &[tid='117']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-117);background-color: var(--e-col-117);}}
+          &[tid='131']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-131);background-color: var(--e-col-131);}}
+          &[tid='126']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-126);background-color: var(--e-col-126);}}
+          &[tid='123']{
+            a.term-link:before, .entree-content span.oblique-wrapper a:before{
+              border-color: var(--e-col-123);background-color: var(--e-col-123);}}
+
+          // &.highlighted{
+          //   a.term_link{
+          //     color: red;
+          //   }
+          // }
+          .entree-content span.oblique-wrapper a:not(:hover):not(.is-active):before{background-color: #fff!important;}
 
-        &:not(.opened){
-          a.term-link:not(:hover):not(.highlighted):before{
+          a.articles-link:not(:hover):not(.is-active):before{
             background-color: #fff!important;
           }
-        }
-        &.opened{
-          // outline: 1px solid purple;
-          a.term-link:after {
-            content: '';
-            position: absolute;
-            left: 15px; right:0;
-            bottom: -3px;
-            border-bottom: 1px solid grey;
+          &:not(.opened):not(.highlighted){
+            a.term-link:not(:hover):before{
+              background-color: #fff!important;
+            }
           }
-          .entree-content{
-            width:350px;
-            opacity: 1;
+          &.opened{
+            // outline: 1px solid purple;
+            a.term-link:after {
+              content: '';
+              position: absolute;
+              left: 15px; right:0;
+              bottom: -3px;
+              border-bottom: 1px solid grey;
+            }
+            .entree-content{
+              width:350px;
+              opacity: 1;
+            }
+          }
+          // &:not(:first-of-type) .entree-content{display: none;}
+        }
+      }
+      &.opened, &.highlighted{
+        li:not(.opened):not(.highlighted){
+          a.term-link{
+            color:#a1a1a1;
           }
         }
-        // &:not(:first-of-type) .entree-content{display: none;}
       }
     }
   }
@@ -1854,6 +1867,9 @@ footer{
       }
     }
     .chutier-icon{
+      &[action="add"]{
+        display:none;
+      }
       position:absolute;
       top:0.4em; right:0.4em;
     }

sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss

@@ -28,7 +28,7 @@ header[role="banner"]{
   >.wrapper{
     position: relative;
     padding:0.5em 0;
-    border-bottom: 1px solid red;
+    // border-bottom: 1px solid red;
     // TODO: what header height to fit well with player ??
     height:70px;
     >.region{

sites/all/themes/custom/edlptheme/edlptheme.theme

@@ -69,7 +69,7 @@ function edlptheme_preprocess_edlp_home(&$vars){
         $cols = 2;
         break;
       default:
-        $cols = 2;
+        $cols = 3;
     };
     $node['cols'] = $cols;
   }

sites/all/themes/custom/edlptheme/templates/content/edlp-home.html.twig

@@ -26,10 +26,10 @@
   {% endfor %}
 
 
-  <div class="agenda col col-2">
+  <div class="agenda col col-3">
     <div class="wrapper">
       {{ agenda }}
     </div>
   </div>
-  
+
 </div>

sites/default/config/sync/linkit.linkit_profile.collection.yml

@@ -18,4 +18,4 @@ matchers:
       group_by_bundle: false
       include_unpublished: false
       substitution_type: canonical
-      metadata: '[node:langcode]'
+      metadata: ''

sites/default/config/sync/views.view.archive.yml

@@ -223,7 +223,7 @@ display:
       tags: {  }
   page_1:
     id: page_1
-    display_title: Page
+    display_title: Production
     display_plugin: page
     position: 2
     display_options:

sites/default/config/sync/views.view.content.yml

@@ -990,7 +990,7 @@ display:
       path: admin/content/production
       menu:
         type: tab
-        title: Productions
+        title: Content
         description: ''
         expanded: false
         parent: 'menu_link_content:8b5fed48-c008-4041-9bda-06f997582175'

sites/default/config/sync/views.view.content_translations.yml

@@ -938,7 +938,7 @@ display:
   page_1:
     display_plugin: page
     id: page_1
-    display_title: Page
+    display_title: Production
     position: 1
     display_options:
       display_extenders: {  }

sites/default/config/sync/views.view.frontpage.yml

@@ -292,7 +292,7 @@ display:
       path: node
       display_extenders: {  }
     display_plugin: page
-    display_title: Page
+    display_title: Production
     id: page_1
     position: 1
     cache_metadata:

sites/default/config/sync/views.view.glossary.yml

@@ -432,7 +432,7 @@ display:
       tags: {  }
   page_1:
     id: page_1
-    display_title: Page
+    display_title: Production
     display_plugin: page
     position: 1
     display_options:

sites/default/config/sync/views.view.maillog_overview.yml

@@ -422,7 +422,7 @@ display:
   page_1:
     display_plugin: page
     id: page_1
-    display_title: Page
+    display_title: Production
     position: 1
     display_options:
       path: admin/reports/maillog

sites/default/config/sync/views.view.redirect.yml

@@ -583,7 +583,7 @@ display:
   page_1:
     display_plugin: page
     id: page_1
-    display_title: Page
+    display_title: Production
     position: 1
     display_options:
       display_extenders: {  }

sites/default/config/sync/views.view.taxonomy_term.yml

@@ -294,7 +294,7 @@ display:
       tags: {  }
   page_1:
     id: page_1
-    display_title: Page
+    display_title: Production
     display_plugin: page
     position: 1
     display_options:

sites/default/config/sync/views.view.user_admin_people.yml

@@ -887,7 +887,7 @@ display:
   page_1:
     display_plugin: page
     id: page_1
-    display_title: Page
+    display_title: Production
     position: 1
     display_options:
       path: admin/people/list