From 4bceb5ea8c211012a7ad6d96f5cf89b65e9309ad Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Mon, 23 Sep 2019 00:37:17 +0200
Subject: [PATCH] Adding proper fixes

---
 src/includes/mentor/browseDatabase.pug | 494 ++++++++++++------------
 src/includes/public/resources/list.pug | 514 +++++++++++++------------
 src/scripts/coopstarter.js             |   2 +
 src/styles/index.scss                  |   8 +-
 4 files changed, 521 insertions(+), 497 deletions(-)

diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index 6280bfb9..7b8062d7 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -50,7 +50,7 @@ container.block_list.flex.flex_espace
                 
                 naked
             )
-        sib-form.more_criterias(
+        sib-form.more_criterias.flex.flex_espace(
             data-src=`${endpoints.resources}`,
             fields='header_criterias, format, publication_year, country, language, fields'
             label-header_criterias='More criterias'
@@ -97,258 +97,268 @@ container.block_list.flex.flex_espace
         div.block_log.block_list
        
             //Step 1
-            sib-display#circles-list(
-                loader-id="resources-loader"
-                data-src=`${endpoints.steps}1/`,
-                fields='name'
-
-                label-name ='Step 1 '
-                label-resources=''
+            div.step
+                sib-display#circles-list(
+                    loader-id="resources-loader"
+                    data-src=`${endpoints.steps}1/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 1 '
+                    label-resources=''
+                    
+                    widget-name='cs-steps-header'
+                )
                 
-                widget-name='cs-steps-header'
-            )
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}1/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
+
             
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}1/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-widget-search_for_a_resource="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="cs-display-property"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-                
-                paginate-by="5"
-            )
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="cs-display-property"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+                    
+                    paginate-by="5"
+                )
 
             //Step 2
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}2/`,
-                fields='name'
-
-                label-name ='Step 2 '
-                label-resources=''
-                
-                widget-name='cs-steps-header'  
-            )
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}2/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 2 '
+                    label-resources=''
+                    
+                    widget-name='cs-steps-header'  
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}2/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
 
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}2/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="cs-display-property"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-                
-                paginate-by="5"
-            )
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="cs-display-property"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+                    
+                    paginate-by="5"
+                )
 
             //Step 3
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}3/`,
-                fields='name'
-
-                label-name ='Step 3 '
-                label-resources=''
-                
-                widget-name='cs-steps-header'   
-
-            )
-
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}3/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="cs-display-property"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-                
-                paginate-by="5"
-            )
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}3/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 3 '
+                    label-resources=''
+                    
+                    widget-name='cs-steps-header'   
+
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}3/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="cs-display-property"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+                    
+                    paginate-by="5"
+                )
 
             //Step 4
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}4/`,
-                fields='name'
-
-                label-name ='Step 4 '
-                label-resources=''
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}4/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 4 '
+                    label-resources=''
+
+                    widget-name='cs-steps-header'
+
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}4/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
 
-                widget-name='cs-steps-header'
-
-            )
-
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}4/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="cs-display-property"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-                
-                paginate-by="5"
-            )
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="cs-display-property"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+                    
+                    paginate-by="5"
+                )
 
             //Step 5
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}5/`,
-                fields='name'
-
-                label-name ='Step 5 '
-                label-resources=''
-
-                widget-name='cs-steps-header'       
-            )
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}5/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 5 '
+                    label-resources=''
+
+                    widget-name='cs-steps-header'       
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}5/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
 
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}5/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="cs-display-property"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-                
-                paginate-by="5"
-            )
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="cs-display-property"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+                    
+                    paginate-by="5"
+                )
             
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index e760e812..185ef222 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -43,7 +43,7 @@ container.block_list.flex.flex_espace
                 
                 naked
             )
-        sib-form.more_criterias(
+        sib-form.more_criterias.flex.flex_espace(
             data-src=`${endpoints.resources}`,
             fields='header_criterias, format, publication_year, country, language, fields'
             label-header_criterias='More criterias'
@@ -90,268 +90,278 @@ container.block_list.flex.flex_espace
         div.block_log.block_list
        
             //Step 1
-            sib-display#circles-list(
-                loader-id="resources-loader"
-                data-src=`${endpoints.steps}1/`,
-                fields='name'
-
-                label-name ='Step 1 '
-                label-resources=''
+            div.step
+                sib-display#circles-list(
+                    loader-id="resources-loader"
+                    data-src=`${endpoints.steps}1/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 1 '
+                    label-resources=''
+                    
+                    widget-name='cs-steps-header'
+                )
                 
-                widget-name='cs-steps-header'
-            )
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}1/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
+
             
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}1/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-widget-search_for_a_resource="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="hidden-widget"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-
-                next='public-resource-detail'
-                
-                paginate-by="5"
-            )
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="hidden-widget"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+
+                    next='public-resource-detail'
+                    
+                    paginate-by="5"
+                )
 
             //Step 2
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}2/`,
-                fields='name'
-
-                label-name ='Step 2 '
-                label-resources=''
-                
-                widget-name='cs-steps-header'  
-            )
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}2/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 2 '
+                    label-resources=''
+                    
+                    widget-name='cs-steps-header'  
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}2/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
 
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}2/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="hidden-widget"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-
-                next='public-resource-detail'
-                
-                paginate-by="5"
-            )
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="hidden-widget"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+
+                    next='public-resource-detail'
+                    
+                    paginate-by="5"
+                )
 
             //Step 3
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}3/`,
-                fields='name'
-
-                label-name ='Step 3 '
-                label-resources=''
-                
-                widget-name='cs-steps-header'   
-
-            )
-
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}3/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="hidden-widget"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-
-                next='public-resource-detail'
-                
-                paginate-by="5"
-            )
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}3/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 3 '
+                    label-resources=''
+                    
+                    widget-name='cs-steps-header'   
+
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}3/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="hidden-widget"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+
+                    next='public-resource-detail'
+                    
+                    paginate-by="5"
+                )
 
             //Step 4
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}4/`,
-                fields='name'
-
-                label-name ='Step 4 '
-                label-resources=''
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}4/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 4 '
+                    label-resources=''
+
+                    widget-name='cs-steps-header'
+
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}4/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
 
-                widget-name='cs-steps-header'
-
-            )
-
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}4/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="hidden-widget"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-
-                next='public-resource-detail'
-                
-                paginate-by="5"
-            )
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="hidden-widget"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+
+                    next='public-resource-detail'
+                    
+                    paginate-by="5"
+                )
 
             //Step 5
-            sib-display#circles-list(
-                data-src=`${endpoints.steps}5/`,
-                fields='name'
-
-                label-name ='Step 5 '
-                label-resources=''
-
-                widget-name='cs-steps-header'       
-            )
+            div.step
+                sib-display#circles-list(
+                    data-src=`${endpoints.steps}5/`,
+                    fields='name'
+                    class="accordion"
+
+                    label-name ='Step 5 '
+                    label-resources=''
+
+                    widget-name='cs-steps-header'       
+                )
+
+                sib-display.resource_by_step(
+                    data-src=`${endpoints.steps}5/resources/`,
+                    fields='name, author, format, publication_year, description,  country, language, fields',
+                    search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
+                    search-range-format=`${endpoints.formats}`
+                    search-range-language=`${endpoints.languages}`
+                    search-range-fields=`${endpoints.fields}`
+                    search-range-type=`${endpoints.types}`
+
+
+                    search-widget-search_for_a_resource="hidden-widget"
+                    search-widget-more_criterias_hidden="hidden-widget"
+                    search-multiple-type='sib-form-dropdown'
+                    search-widget-type='sib-form-auto-completion'
+                    search-multiple-format='sib-form-dropdown'
+                    search-widget-format='sib-form-auto-completion'
+                    search-multiple-language='sib-form-dropdown'
+                    search-widget-language='sib-form-auto-completion'
+                    search-multiple-fields='sib-form-dropdown'
+                    search-widget-fields='sib-form-auto-completion'
 
-            sib-display.resource_by_step(
-                data-src=`${endpoints.steps}5/resources/`,
-                fields='name, author, format, publication_year, description,  country, language, fields',
-                search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',  
-                search-range-format=`${endpoints.formats}`
-                search-range-language=`${endpoints.languages}`
-                search-range-fields=`${endpoints.fields}`
-                search-range-type=`${endpoints.types}`
-
-
-                search-widget-search_for_a_resource="hidden-widget"
-                search-widget-more_criterias_hidden="hidden-widget"
-                search-multiple-type='sib-form-dropdown'
-                search-widget-type='sib-form-auto-completion'
-                search-multiple-format='sib-form-dropdown'
-                search-widget-format='sib-form-auto-completion'
-                search-multiple-language='sib-form-dropdown'
-                search-widget-language='sib-form-auto-completion'
-                search-multiple-fields='sib-form-dropdown'
-                search-widget-fields='sib-form-auto-completion'
-
-        
-                widget-name='cs-display-property'
-                widget-country='cs-display-property'
-                widget-publication_year='cs-display-property'
-                widget-description='cs-display-property'
-                widget-fields='hidden-widget'
-                widget-language="hidden-widget"
-                widget-author="hidden-widget"
-                widget-format='cs-display-multiple-property'
-                label-format=''
-                multiple-format
-                label-language=''
-                multiple-language
-                label-fields=''
-                multiple-fields
-
-                next='public-resource-detail'
-                
-                paginate-by="5"
-            )
+            
+                    widget-name='cs-display-property'
+                    widget-country='cs-display-property'
+                    widget-publication_year='cs-display-property'
+                    widget-description='cs-display-property'
+                    widget-fields='hidden-widget'
+                    widget-language="hidden-widget"
+                    widget-author="hidden-widget"
+                    widget-format='cs-display-multiple-property'
+                    label-format=''
+                    multiple-format
+                    label-language=''
+                    multiple-language
+                    label-fields=''
+                    multiple-fields
+
+                    next='public-resource-detail'
+                    
+                    paginate-by="5"
+                )
             
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 34d69a86..125a5ba7 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -404,5 +404,7 @@ jQuery(document).ready(function($) {
 
   //In the entrepreneur dashboard, we set data from the display form to the hidden ones.
   addProperFilterToSearchComponents('entrepreneur-resource-list');
+  addProperFilterToSearchComponents('mentor-database');
+  addProperFilterToSearchComponents('public-resource-list');
 });
 
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 45057d64..a3e26438 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -749,7 +749,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
     padding: 2rem;
 }
 
-#entrepreneur-resource-list container{
+#entrepreneur-resource-list container, #public-resource-list container, #mentor-database container{
     padding-top: 3.5rem;
     input[name="keyword"]{
         float: left;
@@ -828,12 +828,14 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
         
     }
 }
-#entrepreneur-resource-list cs-display-property[name="name"] p{
+#entrepreneur-resource-list cs-display-property[name="name"] p,
+#public-resource-list cs-display-property[name="name"] p,
+#mentor-database cs-display-property[name="name"] p{
     font-size: 1.6rem;
     color: var(--clr-roll-black);
     padding-left: 2.5rem;
 }
-#more_criterias.flex.flex_espace{
+.more_criterias.flex.flex_espace{
     width: 100%;
 }
 /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-- 
GitLab