diff --git a/src/includes/entrepreneur/components/header.pug b/src/includes/entrepreneur/components/header.pug
index 2efbe86c3b3e0f5a71a3eb4c434d17d019463081..ab9b1d5aca7a5314be7c86572ea74fb9df2d141c 100644
--- a/src/includes/entrepreneur/components/header.pug
+++ b/src/includes/entrepreneur/components/header.pug
@@ -18,9 +18,20 @@
)
input.ico_droite.ico_search
- sib-link(next='entrepreneur-account')
- sib-display#user-account-picture(
- bind-user
- fields='account.picture',
- widget-account.picture='cs-account-picture'
- )
\ No newline at end of file
+ .dropdownWrapper
+ sib-display#user-account-picture.dropdownLabel(
+ bind-user
+ fields='account.picture',
+ widget-account.picture='cs-account-picture'
+ )
+ div.dropdownPanel
+ ul
+ li
+ sib-link(next='entrepreneur-dashboard')
+ p Dashboard
+ li
+ sib-link(next='entrepreneur-account')
+ p My account
+ li
+ a.logout-button
+ p Logout
\ No newline at end of file
diff --git a/src/includes/entrepreneur/components/menu.pug b/src/includes/entrepreneur/components/menu.pug
index b69341d19cd3c24f102b4b5408e8ba5b4b1ac7fb..c37f5312d95a8f0ff3a7dbca419459398969756a 100644
--- a/src/includes/entrepreneur/components/menu.pug
+++ b/src/includes/entrepreneur/components/menu.pug
@@ -2,4 +2,4 @@ sib-router(default-route='entrepreneur-resource-list')
sib-route(name='entrepreneur-resource-list')
sib-route(name='entrepreneur-account', id-prefix=`${endpoints.users}`, use-id)
sib-route(name='entrepreneur-account-edit', id-prefix=`${endpoints.users}`, use-id)
-
\ No newline at end of file
+ sib-route(name='entrepreneur-account-edit-confirmation')
\ No newline at end of file
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 16075cd248e755a5eaed4dddba917d3c1c78640c..5c795315b8800d64b96e7927dd2e4c26e197e1b9 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -40,3 +40,6 @@ section#home
#entrepreneur-account-edit(hidden).no-sidebar.container
include profile/edit.pug
+
+ #entrepreneur-account-edit-confirmation(hidden).no-sidebar.container
+ include profile/confirmation.pug
diff --git a/src/includes/entrepreneur/profile/confirmation.pug b/src/includes/entrepreneur/profile/confirmation.pug
new file mode 100644
index 0000000000000000000000000000000000000000..69a6c69c2a0552b9f01031eb5a31aafb67c10bee
--- /dev/null
+++ b/src/includes/entrepreneur/profile/confirmation.pug
@@ -0,0 +1,9 @@
+div.container_min
+ h2.title_lead.fd_bleu Edit your account
+
+p.p_entete Your modifications have properly been saved.
+
+div
+ div.flex
+ h3.button_base
+ sib-link(next='entrepreneur-resource-list') -> Back to the database
\ No newline at end of file
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index a783c83260e8f158e2cf99c71dc6e3640fc257b0..a437cc5daa71078dc4b0e8ef004e805c58b54814 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -11,7 +11,7 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
label-last_name="Name"
label-username="Username"
label-entrepreneur_profile.organisation="Organisation"
-
+ label-account.picture="Profile picture"
widget-username="sib-form-hidden"
class-last_name='form-label is-dark input_big'
@@ -28,7 +28,7 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
class-account.picture='input_photo w_25'
submit-button="Save modifications"
- next='entrepreneur-resource-list'
+ next='entrepreneur-account-edit-confirmation'
)
sib-link(class="backlink", next="entrepreneur-resource-list") Back to the dashboard
\ No newline at end of file
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index edd6cffe69e21db3c6f0e5a2b929a9ad5043531e..79760e2b3226602eac801039d886412e99a0570b 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -17,7 +17,7 @@ container.block_list.flex.flex_espace
div#resources-loader
hidden <i class="fas fa-cog fa-spin"></i>
- sib-form#search-by-keyword(
+ sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-loader"
fields='keyword(name_keyword, description, author)'
@@ -31,10 +31,10 @@ container.block_list.flex.flex_espace
naked
)
- div#keyword_submit.button__actions
+ div.keyword_submit.button__actions
div.button_base.ico_gauche Search
- sib-form#instance_database_only(
+ sib-form.instance_database_only(
data-src=`${endpoints.resources}`,
fields='instance_database_only'
widget-instance_database_only='cs-display-checkbox'
@@ -42,7 +42,7 @@ container.block_list.flex.flex_espace
naked
)
- sib-form#more_criterias.flex.flex_espace(
+ 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'
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 34dc202dd5c585605af4e62718102ce01b1dcd29..3f431dc843b07ff34c35a4fc07cd5a097858ec02 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -6,7 +6,7 @@ head
script(type="module" src="https://unpkg.com/@startinblox/router")
script(type="module" src="https://unpkg.com/@startinblox/oidc")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
+ script(src="https://kit.fontawesome.com/48014d2af3.js")
script(src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous")
script(src="/scripts/coopstarter.js")
- <script src="https://kit.fontawesome.com/48014d2af3.js"></script>
link(rel="stylesheet" href="/styles/index.css")
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
new file mode 100644
index 0000000000000000000000000000000000000000..7b8062d780fc8c0a6efc6ebb4e5784fd5398ac25
--- /dev/null
+++ b/src/includes/mentor/browseDatabase.pug
@@ -0,0 +1,364 @@
+include ../components/widgets
+
+
+div.container_min
+ h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
+ button.button_dark.pull-right Watch the presentation
+
+div.block_list
+ div.button__actions
+ div.resources__newresource
+ sib-link(next='mentor-resource-create')
+ div
+ div.button_base.ico_gauche.ico_plus Post a new Resource
+
+ div.dashboard__database
+ sib-link(next='mentor-resource-list')
+ div.button_base.ico_gauche.ico_database Back to dashboard
+
+
+container.block_list.flex.flex_espace
+ div.w_75.block-g-entre
+ div
+ h2.title_form Search for a resource
+
+ div#resources-public-loader
+ hidden Loading resources, please wait...
+
+ sib-form.search-by-keyword(
+ data-src=`${endpoints.resources}`,
+ loader-id="resources-public-loader"
+ fields='keyword(name_keyword, description, author)'
+ label-keyword="Search by author, name..."
+ widget-keyword="sib-form-placeholder-text"
+
+ widget-description='cs-display-property'
+ widget-name_keyword='cs-display-property'
+ widget-author='cs-display-property'
+
+ naked
+ )
+
+ div.keyword_submit.button__actions
+ div.button_base.ico_gauche Search
+
+ sib-form.instance_database_only(
+ data-src=`${endpoints.resources}`,
+ fields='instance_database_only'
+ widget-instance_database_only='cs-display-checkbox'
+ class-instance_database_only = 'ss-list checkbox'
+
+ naked
+ )
+ 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'
+ label-format='Format:'
+ label-publication_year='Year of publication'
+ label-country='Country of publication'
+ label-language='Language'
+ label-fields='Field'
+ widget-header_criterias='cs-section_header'
+
+ range-language=`${endpoints.languages}`
+ range-fields=`${endpoints.fields}`
+ range-format=`${endpoints.formats}`
+
+ multiple-language='sib-form-dropdown'
+ widget-language='sib-form-auto-completion'
+
+ multiple-format='sib-form-dropdown'
+ widget-format='sib-form-auto-completion'
+
+ multiple-fields='sib-form-dropdown'
+ widget-fields='sib-form-auto-completion'
+
+ naked
+ )
+
+
+ //Fake tabs to filter by type.
+ div.tabs.flex_espace
+ div(class='tablink filter_by_type active', onclick="openFakeTab(this)")
+ sib-display#type1(
+ data-src="https://api.coopstarter.happy-dev.fr/types/1/"
+ fields='name'
+ widget-name='fake-tabs'
+ )
+
+ div(class='tablink filter_by_type', onclick="openFakeTab(this)")
+ sib-display#type2(
+ data-src="https://api.coopstarter.happy-dev.fr/types/2/"
+ fields='name'
+ widget-name='fake-tabs'
+ )
+
+ div.block_log.block_list
+
+ //Step 1
+ 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'
+ )
+
+ 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"
+ )
+
+ //Step 2
+ 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'
+
+
+ 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
+ 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
+ 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-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
+ 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'
+
+
+ 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/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 00e1d699e5899a62190e162255388cd51dd49fc8..758052bb07ffaf28869d4d2f6a757101366ff5d3 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -18,18 +18,23 @@
)
input.ico_droite.ico_search
- sib-link(next='mentor-account')
- sib-display#user-account-picture(
- bind-user
- fields='account.picture',
- widget-account.picture='cs-account-picture'
- )
-
- sib-link(next='mentor-dashboard')
- p Dashboard
- sib-link(next='mentor-database')
- p Resources database
- sib-link(next='mentor-account')
- p My account
- sib-link.logout-button(next='mentor-dashboard')
- p Logout
\ No newline at end of file
+ .dropdownWrapper
+ sib-display#user-account-picture.dropdownLabel(
+ bind-user
+ fields='account.picture',
+ widget-account.picture='cs-account-picture'
+ )
+ div.dropdownPanel
+ ul
+ li
+ sib-link(next='mentor-dashboard')
+ p Dashboard
+ li
+ sib-link(next='mentor-database')
+ p Resources database
+ li
+ sib-link(next='mentor-account')
+ p My account
+ li
+ a.logout-button
+ p Logout
\ No newline at end of file
diff --git a/src/includes/mentor/components/menu.pug b/src/includes/mentor/components/menu.pug
index f52aa70cbaa020513d84cabf4d20d5bea6b0c172..fbf8d64030e52a11b7e07a12f159eaf3b69217f8 100644
--- a/src/includes/mentor/components/menu.pug
+++ b/src/includes/mentor/components/menu.pug
@@ -7,4 +7,5 @@ sib-router(default-route='mentor-resource-list')
sib-ac-checker(permission="acl:Write" bind-resources)
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-edit', use-id)
sib-route(name='resource-creation-confirmation')
- sib-route(name='mentor-database')
\ No newline at end of file
+ sib-route(name='mentor-database')
+ sib-route(name='mentor-account-edit-confirmation')
\ No newline at end of file
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index eda3a64603191c48042037146fcb4c438811dbe8..252cb167b2a63d5bc4afcf5bb552ba44478c02f5 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -30,6 +30,9 @@ section#home
dialog#resource-validation-process.no-sidebar
include ./validation-process.pug
+ #mentor-database(hidden).no-sidebar.container
+ include ./browseDatabase.pug
+
#mentor-resource-create(hidden).no-sidebar.container
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
include resources/create.pug
@@ -41,16 +44,11 @@ section#home
#resource-creation-confirmation(hidden).no-sidebar.container
include resources/confirmation.pug
- #mentor-database(hidden)
- sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
- include resources/list.pug
-
#mentor-account(hidden).no-sidebar.container
include profile/detail.pug
#mentor-account-edit(hidden).no-sidebar.container
include profile/edit.pug
-
-
-
+ #mentor-account-edit-confirmation(hidden).no-sidebar.container
+ include profile/confirmation.pug
diff --git a/src/includes/mentor/profile/confirmation.pug b/src/includes/mentor/profile/confirmation.pug
new file mode 100644
index 0000000000000000000000000000000000000000..d6b5438838ba4d658a28ca7cffe4f87d4add6550
--- /dev/null
+++ b/src/includes/mentor/profile/confirmation.pug
@@ -0,0 +1,9 @@
+div.container_min
+ h2.title_lead.fd_bleu Edit your account
+
+p.p_entete Your modifications have properly been saved.
+
+div
+ div.flex
+ h3.button_base
+ sib-link(next='mentor-resource-list') -> Back to dashboard
\ No newline at end of file
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index d5b10e3bdbd6e239583655ba3b2947598f514c45..3d2d162664307fb1ff39917dcc06f876d479146f 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -58,8 +58,8 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
class-headline='w_75'
submit-button="Save modifications"
- next='mentor-resource-list'
+ next="mentor-account-edit-confirmation"
)
+sib-link(class="backlink", next="mentor-account") Back to my account
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
-sib-link(class="backlink", next="mentor-account") Back to the profile
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index 5cd92df1339ee2aaecb0124aa9b728b2800d0347..a6a0962de8c23f609198392328fc9c86677f698d 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -18,7 +18,7 @@ div.block_list
div.button_base.ico_gauche.ico_plus Post a new Resource
div.dashboard__database
- sib-link(next='public-dashboard')
+ sib-link(next='mentor-database')
div.button_base.ico_gauche.ico_database Browse database
div.tabs
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index c7c50a9730f5dffc691c24804e3a516e4d722fa1..185ef2224070f411fb00d0e109e0ddefc9d03be8 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -18,7 +18,7 @@ container.block_list.flex.flex_espace
div#resources-public-loader
hidden Loading resources, please wait...
- sib-form#search-by-keyword(
+ sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-public-loader"
fields='keyword(name_keyword, description, author)'
@@ -32,10 +32,10 @@ container.block_list.flex.flex_espace
naked
)
- div#keyword_submit.button__actions
+ div.keyword_submit.button__actions
div.button_base.ico_gauche Search
- sib-form#instance_database_only(
+ sib-form.instance_database_only(
data-src=`${endpoints.resources}`,
fields='instance_database_only'
widget-instance_database_only='cs-display-checkbox'
@@ -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 a81d3d98f07d8ba0a9aaae9c94d0c057193245fd..125a5ba75aacd48aef70841469e24c55a73aca34 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -54,21 +54,23 @@ function refreshPagination() {
var resources_containers = document.querySelectorAll(
".resource_by_step sib-form+div"
);
+
for (let resources_container of resources_containers) {
if (
- resources_container.childElementCount < 5 ||
- resources_container.nextSibling.querySelector("nav span span+span")
- .textContent == 1
+ resources_container.nextSibling && (
+ resources_container.childElementCount < 5 ||
+ resources_container.nextSibling.querySelector("nav span span+span").textContent == 1
+ )
) {
resources_container.nextSibling.setAttribute("style", "display:none");
- } else {
+ } else if (resources_container.nextSibling) {
resources_container.nextSibling.setAttribute("style", "display:block");
}
}
}
//Manage select hidden to fullfill them with more "more criterias" selection
-function selectHiddenManagement(select_hidden, option_selected, form) {
+function selectHiddenManagement(select_hidden, option_selected) {
options_hidden = select_hidden.getElementsByTagName("option");
for (let option_hidden of options_hidden) {
//Removing the selected attribute from previous selection
@@ -79,25 +81,25 @@ function selectHiddenManagement(select_hidden, option_selected, form) {
option_hidden.setAttribute("selected", "selected");
select_hidden.setAttribute("value", option_selected.value);
}
-
- //Trigerring a reload of the associated form
- let parent_form = select_hidden.closest("sib-form");
- parent_form.component.inputChange();
}
- form.querySelector("sib-form").component.inputChange();
+
+ //Trigerring a reload of the associated form
+ let parent_form = select_hidden.closest("sib-form");
+ parent_form.component.inputChange();
refreshPagination();
}
//Manage input hidden field to fullfill them with more "more criterias" selection
-function inputHiddenManagement(field, field_search, form) {
+function inputHiddenManagement(field, field_search) {
field.setAttribute("value", field_search.value);
- form.querySelector("sib-form").component.inputChange();
+ let parent_form = field.closest("sib-form");
+ parent_form.component.inputChange();
refreshPagination();
}
//Manage select hidden for type to fullfill them with more "more criterias" selection
function selectHiddenManagementForType(tab, form) {
- let type_hidden_field = document.querySelectorAll(
+ let type_hidden_field = form.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="type"]'
);
if (tab.classList.contains("active")) {
@@ -114,10 +116,9 @@ function selectHiddenManagementForType(tab, form) {
//Actually selecting the option if it is the good one
option_hidden.setAttribute("selected", "selected");
select_hidden.setAttribute("value", option_hidden.value);
- form.querySelector("sib-form").component.inputChange();
- refreshPagination();
}
}
+
//Trigerring a reload of the associated form
let parent_form = select_hidden.closest("sib-form");
parent_form.component.inputChange();
@@ -126,96 +127,9 @@ function selectHiddenManagementForType(tab, form) {
}
}
-jQuery(document).ready(function($) {
- //Refresh pagination
- refreshPagination();
- console.log('toto');
- // Get the element with id="defaultOpen" and click on it
- document.getElementById("defaultOpen").click();
-
- let userAccountDataSrc = document.getElementById("user-account-picture");
- linkDatasetToField(userAccountDataSrc, "validation-form", "reviewer");
- linkDatasetToField(userAccountDataSrc, "improvement-dialog-form", "reviewer");
- linkDatasetToField(userAccountDataSrc, "refusal-dialog-form", "reviewer");
-
- refreshList("resource-creation-form", "resources-history");
- refreshList("validation-form", "pending-resources");
- refreshList("refusal-dialog-form", "pending-resources");
- refreshList("improvement-dialog-form", "pending-resources");
- refreshList("entrepreneur_profile_creation", "entrepreneur_info");
- refreshList("entrepreneur_profile_creation", "entrepreneur_contact");
- refreshList("mentor_profile_creation", "mentor_info");
- refreshList("mentor_profile_creation", "mentor_complementary");
- refreshList("mentor_profile_creation", "mentor_contact");
- refreshList("entrepreneur_profile_edition", "entrepreneur_info");
- refreshList("entrepreneur_profile_edition", "entrepreneur_contact");
- refreshList("mentor_profile_edition", "mentor_info");
- refreshList("mentor_profile_edition", "mentor_complementary");
- refreshList("mentor_profile_edition", "mentor_contact");
-
- const logoutButtons = document.getElementsByClassName("logout-button");
- for (var i = 0; i < logoutButtons.length; i++) {
- logoutButtons[i].addEventListener("click", function() {
- window.dispatchEvent(
- new CustomEvent("requestNavigation", {
- detail: { route: "splash-index" }
- })
- );
- document.querySelector("sib-auth").logout();
- setTimeout(function() {
- location.reload();
- }, 1000);
- });
- }
-
- //MENTOR DASHBOARD*************************************************************
- window.setTimeout(() => {
-
- //Manage the accordion in request mentor dashboard.
- var accRequest = document.querySelectorAll(
- "#requests accordion-request-resource"
- );
- console.log(accRequest);
- var i;
-
- for (i = 0; i < accRequest.length; i++) {
- accRequest[i].addEventListener("click", function() {
- /* Toggle between adding and removing the "active" class,
- to highlight the button that controls the panel */
- this.classList.toggle("active");
-
- /* Toggle between hiding and showing the active panel */
- var panelRequest = this.nextElementSibling;
- if (panelRequest.style.maxHeight) {
- panelRequest.style.maxHeight = null;
- } else {
- panelRequest.style.maxHeight = panelRequest.scrollHeight + "px";
- }
- });
- }
- }, 4000);
-
- //ENTREPRENEUR DASHBOARD*************************************************************
-
- //Accordion by step
- var acc = document.getElementsByClassName("accordion");
- var i;
-
- for (i = 0; i < acc.length; i++) {
- acc[i].addEventListener("click", function() {
- this.classList.toggle("active");
- var panel = this.nextElementSibling;
- if (panel.style.display === "block") {
- panel.style.display = "none";
- } else {
- panel.style.display = "block";
- }
- });
- }
-
- //In the entrepreneur dashboard, we set data from the display form to the hidden ones.
- var forms = document.querySelectorAll(".resource_by_step");
-
+function addProperFilterToSearchComponents(targetId) {
+ var baseElement = document.getElementById(targetId);
+ var forms = baseElement.querySelectorAll(".resource_by_step");
forms.forEach(form => {
form.addEventListener("populate", e => {
//Manage fake tabs
@@ -231,65 +145,42 @@ jQuery(document).ready(function($) {
//To retrieve keyword
//https://git.happy-dev.fr/startinblox/framework/sib-core/issues/379
//TODO: Wait for a solution to filter with multiple value with "OR" instead of "AND".
- let keyword_form = document.getElementById("search-by-keyword");
+ let keyword_form = baseElement.querySelectorAll(".search-by-keyword")[0];
let keyword_field = keyword_form.querySelector(`input[name="keyword"]`);
- let keyword_submit = document.getElementById(`keyword_submit`);
- let keyword_hidden_fields = document.querySelectorAll(
+ let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
+ let keyword_hidden_fields = baseElement.querySelectorAll(
'hidden-widget[name="search_for_a_resource"] input'
);
keyword_submit.addEventListener("click", function() {
keyword_hidden_fields.forEach(hidden_field => {
hidden_field.setAttribute("value", keyword_field.value);
- form.querySelector("sib-form").component.inputChange();
+ let parent_form = hidden_field.closest("sib-form");
+ parent_form.component.inputChange();
refreshPagination();
});
});
//SEARCH IN DATABASE INSTANCE ONLY
- let instance_only = document.getElementById("instance_database_only");
+ let instance_only = baseElement.querySelectorAll(".instance_database_only")[0];
let checkbox_instance_only = instance_only.querySelector("input");
-
- checkbox_instance_only.onclick = function() {
- if (this.checked) {
- //We have to retrieve all data-scr needed to make them pointed only on the instance.
- //How to?
- }
- };
+ if (checkbox_instance_only) {
+ checkbox_instance_only.onclick = function() {
+ if (this.checked) {
+ //We have to retrieve all data-scr needed to make them pointed only on the instance.
+ //How to?
+ }
+ };
+ }
//MORE CRITERIAS
- const more_criterias_form = document.getElementById("more_criterias");
+ const more_criterias_form = baseElement.querySelectorAll(".more_criterias")[0];
// https://git.happy-dev.fr/startinblox/framework/sib-core/issues/453
window.setTimeout(() => {
- //Refresh data list on delete resources
- const deleteButton = document.querySelectorAll("sib-delete");
- for (var i = 0; i < deleteButton.length; i++) {
- deleteButton[i].addEventListener("resourceDeleted", e => {
- const historyList = document.getElementById("resources-history");
- historyList.dataset.src = historyList.dataset.src;
-
- let confirm_suppress = document.getElementById("confirm_suppress");
- confirm_suppress.setAttribute("hidden", "hidden");
-
- //If we supress from the detail resource view, we close this view.
- let mentor_resource_detail = document.getElementById(
- "mentor-resource-detail"
- );
- mentor_resource_detail.setAttribute("hidden", "hidden");
- this.dispatchEvent(
- new CustomEvent("requestNavigation", {
- bubbles: true,
- detail: { route: "actions" }
- })
- );
- });
- }
-
//Manage fake tabs for type
let tabs = document.getElementsByClassName("filter_by_type");
-
for (let tab of tabs) {
tab.addEventListener(
"click",
@@ -301,7 +192,7 @@ jQuery(document).ready(function($) {
let format_field_search = more_criterias_form.querySelector(
`select[name="format"]`
);
- let format_hidden_field = document.querySelectorAll(
+ let format_hidden_field = baseElement.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="format"]'
);
@@ -312,7 +203,7 @@ jQuery(document).ready(function($) {
);
format_hidden_field.forEach(function(select_hidden) {
- selectHiddenManagement(select_hidden, option_selected, form);
+ selectHiddenManagement(select_hidden, option_selected);
});
};
@@ -320,7 +211,7 @@ jQuery(document).ready(function($) {
let language_field_search = more_criterias_form.querySelector(
`select[name="language"]`
);
- language_hidden_field = document.querySelectorAll(
+ language_hidden_field = baseElement.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="language"]'
);
@@ -330,7 +221,7 @@ jQuery(document).ready(function($) {
);
language_hidden_field.forEach(function(select_hidden) {
- selectHiddenManagement(select_hidden, option_selected, form);
+ selectHiddenManagement(select_hidden, option_selected);
});
};
@@ -338,7 +229,7 @@ jQuery(document).ready(function($) {
let field_field_search = more_criterias_form.querySelector(
`select[name="fields"]`
);
- let field_hidden_field = document.querySelectorAll(
+ let field_hidden_field = baseElement.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="fields"]'
);
@@ -348,7 +239,7 @@ jQuery(document).ready(function($) {
);
field_hidden_field.forEach(function(select_hidden) {
- selectHiddenManagement(select_hidden, option_selected, form);
+ selectHiddenManagement(select_hidden, option_selected);
});
};
@@ -358,7 +249,7 @@ jQuery(document).ready(function($) {
let year_field_search = more_criterias_form.querySelector(
`input[name="publication_year"]`
);
- let year_hidden_fields = document.querySelectorAll(
+ let year_hidden_fields = baseElement.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] input[name="publication_year"]'
);
@@ -372,7 +263,7 @@ jQuery(document).ready(function($) {
let country_field_search = more_criterias_form.querySelector(
`input[name="country"]`
);
- let country_hidden_fields = document.querySelectorAll(
+ let country_hidden_fields = baseElement.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] input[name="country"]'
);
@@ -381,7 +272,139 @@ jQuery(document).ready(function($) {
inputHiddenManagement(field, country_field_search, form);
});
});
- }, 4000);
+ }, 1000);
});
});
+}
+
+jQuery(document).ready(function($) {
+ //Refresh pagination
+ refreshPagination();
+
+ // Get the element with id="defaultOpen" and click on it
+ document.getElementById("defaultOpen").click();
+
+ let userAccountDataSrc = document.getElementById("user-account-picture");
+ linkDatasetToField(userAccountDataSrc, "validation-form", "reviewer");
+ linkDatasetToField(userAccountDataSrc, "improvement-dialog-form", "reviewer");
+ linkDatasetToField(userAccountDataSrc, "refusal-dialog-form", "reviewer");
+
+ refreshList("resource-creation-form", "resources-history");
+ refreshList("validation-form", "pending-resources");
+ refreshList("refusal-dialog-form", "pending-resources");
+ refreshList("improvement-dialog-form", "pending-resources");
+ refreshList("entrepreneur_profile_creation", "entrepreneur_info");
+ refreshList("entrepreneur_profile_creation", "entrepreneur_contact");
+ refreshList("mentor_profile_creation", "mentor_info");
+ refreshList("mentor_profile_creation", "mentor_complementary");
+ refreshList("mentor_profile_creation", "mentor_contact");
+ refreshList("entrepreneur_profile_edition", "entrepreneur_info");
+ refreshList("entrepreneur_profile_edition", "entrepreneur_contact");
+ refreshList("mentor_profile_edition", "mentor_info");
+ refreshList("mentor_profile_edition", "mentor_complementary");
+ refreshList("mentor_profile_edition", "mentor_contact");
+
+ var header_dropdown = $('.dropdownWrapper'),
+ drop_choices = header_dropdown.find('.dropdownLabel');
+
+ if (drop_choices) {
+ drop_choices.on('click', function(e){
+ e.stopPropagation();
+ var element = $(this).parent();
+ element.find('.dropdownPanel').fadeToggle(500);
+ });
+
+ $("body").click(function(){
+ $('.dropdownPanel').hide(500);
+ });
+ }
+
+ const logoutButtons = document.getElementsByClassName("logout-button");
+ for (var i = 0; i < logoutButtons.length; i++) {
+ logoutButtons[i].addEventListener("click", function() {
+ window.dispatchEvent(
+ new CustomEvent("requestNavigation", {
+ detail: { route: "splash-index" }
+ })
+ );
+ document.querySelector("sib-auth").logout();
+ setTimeout(function() {
+ location.reload();
+ }, 1000);
+ });
+ }
+
+ //MENTOR DASHBOARD*************************************************************
+ window.setTimeout(() => {
+ //Manage the accordion in request mentor dashboard.
+ var accRequest = document.querySelectorAll(
+ "#requests accordion-request-resource"
+ );
+
+ for (let i = 0; i < accRequest.length; i++) {
+ accRequest[i].addEventListener("click", function() {
+ /* Toggle between adding and removing the "active" class,
+ to highlight the button that controls the panel */
+ this.classList.toggle("active");
+
+ /* Toggle between hiding and showing the active panel */
+ var panelRequest = this.nextElementSibling;
+ if (panelRequest.style.maxHeight) {
+ panelRequest.style.maxHeight = null;
+ } else {
+ panelRequest.style.maxHeight = panelRequest.scrollHeight + "px";
+ }
+ });
+ }
+
+ //Refresh data list on delete resources
+ const deleteButton = document.querySelectorAll("sib-delete");
+ for (var i = 0; i < deleteButton.length; i++) {
+ deleteButton[i].addEventListener("resourceDeleted", e => {
+ const historyList = document.getElementById("resources-history");
+ historyList.dataset.src = historyList.dataset.src;
+
+ let confirm_suppress = document.getElementById("confirm_suppress");
+ confirm_suppress.setAttribute("hidden", "hidden");
+
+ //If we supress from the detail resource view, we close this view.
+ let mentor_resource_detail = document.getElementById(
+ "mentor-resource-detail"
+ );
+ mentor_resource_detail.setAttribute("hidden", "hidden");
+ this.dispatchEvent(
+ new CustomEvent("requestNavigation", {
+ bubbles: true,
+ detail: { route: "actions" }
+ })
+ );
+ });
+ }
+ }, 2000);
+
+ //ENTREPRENEUR DASHBOARD*************************************************************
+
+ window.setTimeout(() => {
+ //Accordion by step
+ var acc = document.getElementsByClassName("accordion");
+ var i;
+
+ for (i = 0; i < acc.length; i++) {
+ acc[i].addEventListener("click", function() {
+ this.classList.toggle("active");
+ var panel = this.nextElementSibling;
+ if (panel.style.display === "block") {
+ panel.style.display = "none";
+ } else {
+ panel.style.display = "block";
+ }
+ });
+ }
+ }, 2000);
+
+ //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 99c68bf4e432f67083a3c15744d3dafb9977ae3c..3bb0c021f4947631860e2001632cae4a2480e75e 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -749,13 +749,13 @@ 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;
width: 76%;
}
- #keyword_submit div{
+ .keyword_submit div{
float: right;
margin-top: 0;
width: 20%;
@@ -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
@@ -1342,4 +1344,59 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
b, strong {
font-weight: bolder;
+}
+
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXX HEADER DROPDOWNXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
+.dropdownWrapper {
+ display: inline-block;
+ padding: 0px;
+ position: relative;
+ border-radius: 3px;
+ text-align: center;
+}
+
+.dropdownWrapper:hover img{ opacity: .5; }
+
+.dropdownLabel {
+ cursor: pointer;
+}
+
+#header .flex .dropdownPanel {
+ position: absolute;
+ min-width: 150px;
+ background-color: #444C4D;
+ left: -100%;
+ top: 5px;
+ margin-top: 35px;
+ display: none;
+ z-index: 2;
+ ul {
+ padding: 0;
+ margin:0;
+ list-style: none;
+ }
+ a {
+ margin: 0;
+ }
+ sib-link, a{
+ display: block;
+ padding: 10px 20px;
+ text-decoration: none;
+ color: white;
+ transition: .5s all ease-in;
+ cursor: pointer;
+ p {
+ margin: 0;
+ }
+ }
+ sib-link:hover, a:hover{
+ background: #2D3132;
+ }
+ li:not(last-child){
+ border-bottom: 1px solid #5E696B;
+ }
}
\ No newline at end of file