src/includes/entrepreneur/components/header.pug

@@ -8,11 +8,11 @@
         
         div.flex.flex_espace.flex_item_center
             sib-form.languageChoice(
-                data-src=`${endpoints.languages}`
+                data-src=`${endpoints.interfacelanguages}`
                 fields='languages'
-                range-languages=`${endpoints.languages}`
+                range-languages=`${endpoints.interfacelanguages}`
                 widget-languages='sib-form-dropdown'
-                selected-languages=`${endpoints.languages}/1/`
+                selected-languages=`${endpoints.interfacelanguages}1/`
                 label-languages=''
                 naked
             )
@@ -23,6 +23,7 @@
                     fields='account.picture',
                     widget-account.picture='cs-account-picture'
                 )
+
                 div.dropdownPanel
                     ul
                         li

src/includes/mentor/resources/list.pug

@@ -128,6 +128,7 @@ div.block_list
                     widget-review.status='cs-resource-status',
                     search-widget-header_criterias="cs-section_header"
                     search-label-header_criterias="More criterias"
+                    search-class-header_criterias="accordion-form active"
 
                     search-label-format=`${data.Format}`
                     search-label-publication_year=`${data.DatePublication}`

src/includes/mentor/resources/validate.pug

@@ -4,7 +4,7 @@ sib-router
   sib-route(name='review-submission-confirmation')
 
 .block_log.block_creat_count.no_shadow
-  sib-link(class="backlink", next="mentor-resource-list")
+  sib-link(class="backlink", next="mentor-dashboard")
     .like
       p.backlink 
         i.fas.fa-times

src/scripts/coopstarter.js

@@ -236,10 +236,10 @@ function InitManagementForType() {
                 select_hidden.setAttribute("value", option_hidden.value);
               }
             }
-           //Trigerring a reload of the associated form
-      let parent_form = select_hidden.closest("sib-form");
-      parent_form.component.inputChange();
-      refreshPagination();
+            //Trigerring a reload of the associated form
+            let parent_form = select_hidden.closest("sib-form");
+            parent_form.component.inputChange();
+            refreshPagination();
           });
         });
       },
@@ -296,6 +296,26 @@ function manageAccordionByStep(){
   }
 }
 
+/**
+ * Manage the accordion "more criteria"
+ */
+function manageAccordionMoreCriteria(){
+  var acc = document.getElementsByClassName("accordion-form");
+
+  for (let item of acc) {
+    item.addEventListener("click", function() {
+      this.classList.toggle("active");
+      
+      var panelForm = this.nextElementSibling;
+      if (!this.classList.contains("active")) {
+        panelForm.style.maxHeight = "0px";
+      } else {
+        panelForm.style.maxHeight = panelForm.scrollHeight + "px";
+      }
+    });
+  }
+}
+
 /**
  * Manage the accordion for requested resources in the mentor dashboard
  */
@@ -345,10 +365,10 @@ function manageLogoutButton() {
 /**
  * Manage the select language
  */
-function manageSelectLanguage() {
+async function manageSelectLanguage() {
   const languageSelects = document.getElementsByClassName("languageChoice")
   for (let item of languageSelects) {
-    item.addEventListener("change", function() {
+    item.addEventListener("change", async function() {
       //We listen the selected option for the language
       uriLanguage = item.querySelector("option:checked").value
 
@@ -357,17 +377,13 @@ function manageSelectLanguage() {
       var base_url = location.host
 
       //If the selected language is french
-      if (uriLanguage.substr(uriLanguage.length - 14) == 'languages/1/"}') {
-        //Redirection with the appropriate prefixe.
-        var redirect = "http://"+base_url+'/fr/'+pathAfterThePrefix
-
-        document.location.href = redirect
-      } else {
-        var redirect = "http://"+base_url+'/en/'+pathAfterThePrefix
-        document.location.href = redirect
-        
-      }
-      
+      let languagesList = await item.component.resource['ldp:contains'];
+      languagesList.forEach(async (resource) => {
+        if (item.component.value.languages['@id'] == resource['@id']) {
+          var redirect = "http://"+base_url+'/' + (await resource.code).toLowerCase() + '/'+pathAfterThePrefix
+          document.location.href = redirect
+        } 
+      });
     })
   }
 }
@@ -897,6 +913,8 @@ jQuery(document).ready(function($) {
   window.setTimeout(() => {
     //Manage accordion by step
     manageAccordionByStep();
+    //manage accordion for "More criteria"
+    manageAccordionMoreCriteria();
 
     //Init the form file behaviour
     // initFileUpload();

src/styles/index.scss

@@ -1482,6 +1482,31 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{
           max-height: 1500px;
       }
 }
+
+/* Enable the accordion of "more criteria form"*/
+sib-set-default[name="more_criterias_hidden"]{
+    max-height: 235px;
+    overflow: hidden;
+    transition: max-height 0.2s ease-out;
+}
+
+.accordion-form h2{
+    position : relative
+}
+.accordion-form h2:after {
+    font-family: "Font Awesome 5 pro";
+    content: "\f078";
+    font-weight: 900;
+    right: 0;
+    position: absolute;
+    transform-origin: .7rem .7rem;
+    transform: rotate(0);
+}
+
+.accordion-form.active h2:after {
+    transform: rotate(-90deg);
+}
+
 /*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
 .format_type p{
     border-radius: 5px;