diff --git a/cypress/integration/public-access.spec.js b/cypress/integration/public-access.spec.js
index 096ae0cba41d4c46134b2f85f6a03e51db86cccc..165e0b43fa2a289cd490e4fb53c0330a2872a77f 100644
--- a/cypress/integration/public-access.spec.js
+++ b/cypress/integration/public-access.spec.js
@@ -3,6 +3,7 @@
context('Window', () => {
before(() => {
cy.visit('/en/');
+ cy.wait(500);
cy.get('#public-access').click();
});
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 5ab66fb59b0c0b724489fb14a489d136c36961e2..ff31811f18caab4bc0e67a994eb7925168e58206 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -117,8 +117,8 @@ sib-widget(name='cs-display-entrepreneur-related')
) ${await value.name}
sib-widget(name='cs-display-multiple-property')
- template
- p #[b ${label}] ${await value.name}
+ template
+ p ${await value.name},
sib-widget(name='cs-display-step-property')
template
@@ -261,6 +261,6 @@ sib-widget(name="iframe-video-resource")
sib-widget(name="cs-display-sharing")
template
- p #[b ${label}] ${await value == 'https://api-staging.coopstarter.happy-dev.fr/sharingcriterias/3/' ? `public` : (await value == 'https://api-staging.coopstarter.happy-dev.fr/sharingcriterias/1/' ? `private` : `organisation` ) }
+ p #[b ${label}] ${await value == 'https://api-staging.coopstarter.happy-dev.fr/sharingcriterias/3/' ? `public` : (await value == 'https://api-staging.coopstarter.happy-dev.fr/sharingcriterias/1/' ? `Private` : `Organisation` ) }
\ No newline at end of file
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index a85e4dab5456e64f4c393939e35483e040107d81..9cf8fdefcb61e77fa859f85585a6dc0cd23aa5dd 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -16,7 +16,7 @@
content(preview_image, iframe_link),\
description, review.reviewer.account.picture, review.reviewer,\
copyright, specifications(\
- header_specifications, resource_author, country.name, language.name,\
+ header_specifications, resource_author, country.name, languages,\
publication_year, fields, sharing)',
widget-submitter='cs-display-entrepreneur-link'
@@ -35,7 +35,6 @@
widget-name='cs-display-property'
widget-publication_year='cs-display-resource-property'
widget-sharing='cs-display-sharing'
- widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
widget-preview_image='cs-preview-picture'
@@ -46,9 +45,8 @@
widget-iframe_link='iframe-video-resource'
label-broken=`${data.ReportBrokenLink}`
- label-sharing=`${data.Access}`
- label-language.name=`${data.Language}`
- label-publication_year=`${data.DatePublication}`
+ label-sharing=`${data.Access}: `
+ label-publication_year=`${data.DatePublication}: `
label-header_specifications=`${data.ResourceSpecifications}`
class-format.name='format_type'
label-format.name=''
@@ -58,17 +56,22 @@
each-label-steps=`${data.Step}`
multiple-steps
+ widget-languages='cs-display-multiple-property'
+ label-languages=`${data.Language}: `
+ each-label-languages=''
+ multiple-languages
+
widget-fields='cs-display-multiple-property'
- label-fields=''
- each-label-fields=`${data.Field}`
+ label-fields=`${data.Field}: `
+ each-label-fields=''
multiple-fields
label-skills=`${data.WithThisResourceBeAbleTo}`
label-uri=`${data.LinkToResource}`
name-uri='original-link'
- label-country.name=`${data.Country}`
+ label-country.name=`${data.Country}: `
label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
- label-resource_author=`${data.Author}`
+ label-resource_author=`${data.Author}: `
label-submitter=`${data.ResourcePostedBy}: `
label-review.reviewer=`${data.ResourceValidatedBy}: `
action-broken='resource-report-broken-link-entrepreneur'
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index d39acb3454fa6ad3b9515cf211a68c7506202107..8b4f9f94d7d87b33d067ffdfe0f41588a6baa349 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -44,16 +44,16 @@ container.block_list
sib-form.more_criterias.flex.flex_espace(
data-src=`${endpoints.resources}`,
- fields='header_criterias, format, publication_year, country, language, fields'
+ fields='header_criterias, format, publication_year, country, languages, fields'
label-header_criterias=`${data.Search}`
label-format=`${data.Format}`
label-publication_year=`${data.DatePublication}`
label-country=`${data.CountryPublication}`
- label-language=`${data.Language}`
+ label-languages=`${data.Language}`
label-fields=`${data.Field}`
widget-header_criterias='cs-section_header'
- range-language=`${endpoints.languages}`
+ range-languages=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-format=`${endpoints.formats}`
range-country=`${endpoints.countries}`
@@ -61,8 +61,8 @@ container.block_list
multiple-country='sib-form-dropdown'
widget-country='sib-form-auto-completion'
- multiple-language='sib-form-dropdown'
- widget-language='sib-form-auto-completion'
+ multiple-languages='sib-form-dropdown'
+ widget-languages='sib-form-auto-completion'
multiple-format='sib-form-dropdown'
widget-format='sib-form-auto-completion'
@@ -121,10 +121,10 @@ container.block_list
sib-display.resource_by_step(
data-src=`${endpoints.step1}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -137,8 +137,8 @@ container.block_list
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -148,12 +148,12 @@ container.block_list
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -178,10 +178,10 @@ container.block_list
sib-display.resource_by_step(
data-src=`${endpoints.step2}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -194,8 +194,8 @@ container.block_list
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -205,12 +205,12 @@ container.block_list
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -233,10 +233,10 @@ container.block_list
sib-display.resource_by_step(
data-src=`${endpoints.step3}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -249,8 +249,8 @@ container.block_list
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -259,12 +259,12 @@ container.block_list
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -289,10 +289,10 @@ container.block_list
sib-display.resource_by_step(
data-src=`${endpoints.step4}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -305,8 +305,8 @@ container.block_list
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -316,12 +316,12 @@ container.block_list
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -345,10 +345,10 @@ container.block_list
sib-display.resource_by_step(
data-src=`${endpoints.step5}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -361,8 +361,8 @@ container.block_list
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -372,12 +372,12 @@ container.block_list
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -401,10 +401,10 @@ container.block_list
sib-display.resource_by_step(
data-src=`${endpoints.step6}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -417,8 +417,8 @@ container.block_list
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -428,12 +428,12 @@ container.block_list
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug
index 4cee7fdfd4a46efbe920d56775a6e752fa7153c1..8adcd1817cb4d70dbd8a9f673e973ab6bfe98940 100644
--- a/src/includes/mentor/resources/create.pug
+++ b/src/includes/mentor/resources/create.pug
@@ -5,7 +5,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
.block_log.block_creat_count
sib-form#resource_creation_form(
data-src=`${endpoints.resources}`
- fields="mandatory_information(header_mandatory, name, country, language, uri,\
+ fields="mandatory_information(header_mandatory, name, country, languages, uri,\
format, fields, resource_author, publication_year, skills),\
complementary_information(header_complementary, description, iframe_link,\
preview_image),classification(header_classification, target, type, steps),\
@@ -22,7 +22,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
range-sharing=`${endpoints.criterias}`
range-format=`${endpoints.formats}`
range-steps=`${endpoints.steps}`
- range-language=`${endpoints.languages}`
+ range-languages=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-related=`${endpoints.resources}`
range-country=`${endpoints.countries}`
@@ -35,7 +35,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
label-name=`${data.TitleRequired}`
label-country=`${data.Country}*`
- label-language=`${data.Language}*`
+ label-languages=`${data.Language}*`
label-uri=`${data.LocationWeblinkReq}`
label-format=`${data.FormatReq}`
label-fields=`${data.FieldRequired}`
@@ -67,7 +67,8 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
multiple-steps='sib-multiple-select'
widget-steps='sib-form-auto-completion'
- widget-language='sib-form-auto-completion'
+ multiple-languages='sib-multiple-select'
+ widget-languages='sib-form-auto-completion'
multiple-related='sib-multiple-select'
widget-related='sib-form-auto-completion'
@@ -82,7 +83,6 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
class-preview_image='input_photo w_25'
widget-iframe_link='sib-form-textarea'
-
submit-button=`${data.SendForValidation}`
next="resource-creation-confirmation"
)
\ No newline at end of file
diff --git a/src/includes/mentor/resources/database.pug b/src/includes/mentor/resources/database.pug
index 6d627dcf495c5101cbbf74bd8a1fa814f7adbd01..bde275f366b6d538e21576d1c38810d8a0141f8b 100644
--- a/src/includes/mentor/resources/database.pug
+++ b/src/includes/mentor/resources/database.pug
@@ -46,16 +46,16 @@ container.block_list.flex.flex_espace
//- )
sib-form.more_criterias.flex.flex_espace(
data-src=`${endpoints.resources}`,
- fields='header_criterias, format, publication_year, country, language, fields'
+ fields='header_criterias, format, publication_year, country, languages, fields'
label-header_criterias=`${data.MoreCriterias}`
label-format=`${data.Format}`
label-publication_year=`${data.DatePublication}`
label-country=`${data.CountryPublication}`
- label-language=`${data.Language}`
+ label-languages=`${data.Language}`
label-fields=`${data.Field}`
widget-header_criterias='cs-section_header'
- range-language=`${endpoints.languages}`
+ range-languages=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-format=`${endpoints.formats}`
range-country=`${endpoints.countries}`
@@ -63,8 +63,8 @@ container.block_list.flex.flex_espace
multiple-country='sib-form-dropdown'
widget-country='sib-form-auto-completion'
- multiple-language='sib-form-dropdown'
- widget-language='sib-form-auto-completion'
+ multiple-languages='sib-form-dropdown'
+ widget-languages='sib-form-auto-completion'
multiple-format='sib-form-dropdown'
widget-format='sib-form-auto-completion'
@@ -113,10 +113,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step1}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -129,8 +129,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -140,12 +140,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -169,10 +169,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step2}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -185,8 +185,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -196,12 +196,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -226,10 +226,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step3}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -242,8 +242,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -253,12 +253,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -283,10 +283,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step4}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -299,8 +299,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -310,12 +310,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -339,10 +339,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step5}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -355,8 +355,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -366,12 +366,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -395,10 +395,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step6}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -411,8 +411,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -422,12 +422,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index a49250684c54eb388eb8c5816954d5e77183cb8b..4fb9a3b7114ffbf49501f3703c873104c86014ea 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -7,7 +7,7 @@ sib-display#detail-mentor(
content(preview_image, iframe_link),\
description, review.reviewer.account.picture, review.reviewer,\
copyright, specifications(\
- header_specifications, resource_author, country.name, language.name,\
+ header_specifications, resource_author, country.name, languages,\
publication_year, fields, sharing)',
widget-submitter='cs-display-mentor-link',
@@ -27,7 +27,6 @@ sib-display#detail-mentor(
widget-name='cs-display-property'
widget-publication_year='cs-display-resource-property'
widget-sharing='cs-display-sharing'
- widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
widget-preview_image='cs-preview-picture'
@@ -37,9 +36,8 @@ sib-display#detail-mentor(
widget-header_specifications='cs-section_header'
label-broken=`${data.ReportBrokenLink}`
- label-sharing=`${data.Access} : `
- label-language.name=`${data.Language} : `
- label-publication_year=`${data.DatePublication} : `
+ label-sharing=`${data.Access}: `
+ label-publication_year=`${data.DatePublication}: `
label-header_specifications=`${data.ResourceSpecifications}`
label-format.name=''
widget-iframe_link='iframe-video-resource'
@@ -49,17 +47,22 @@ sib-display#detail-mentor(
each-label-steps=`${data.Step}`
multiple-steps
+ widget-languages='cs-display-multiple-property'
+ label-languages=`${data.Language}: `
+ each-label-languages=''
+ multiple-languages
+
widget-fields='cs-display-multiple-property'
- label-fields=''
- each-label-fields=`${data.Field} : `
+ label-fields=`${data.Field}: `
+ each-label-fields=''
multiple-fields
label-skills=`${data.WithThisResourceBeAbleTo}`
label-uri=`${data.LinkToResource}`
name-uri='original-link'
- label-country.name=`${data.Country} : `
+ label-country.name=`${data.Country}: `
label-submitter.mentorProfile.organisation.name=`${data.Organisation} : `
- label-resource_author=`${data.Author} : `
+ label-resource_author=`${data.Author}: `
label-submitter=`${data.ResourcePostedBy}: `
label-review.reviewer=`${data.ResourceValidatedBy}: `
action-broken='resource-report-broken-link-mentor'
diff --git a/src/includes/mentor/resources/edit.pug b/src/includes/mentor/resources/edit.pug
index 48bfbc4a2964eed5c6145c5dbf149f43b0b3247e..b7ecd99df99841b61033dfd3eb06f2788b1b7b23 100644
--- a/src/includes/mentor/resources/edit.pug
+++ b/src/includes/mentor/resources/edit.pug
@@ -6,7 +6,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
sib-form#resource_edition_form(
bind-resources
partial
- fields="mandatory_information(header_mandatory, name, country, language, uri,\
+ fields="mandatory_information(header_mandatory, name, country, languages, uri,\
format, fields, resource_author, publication_year, skills),\
complementary_information(header_complementary, description, iframe_link,\
preview_image),classification(header_classification, target, type, steps),\
@@ -22,7 +22,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
range-type=`${endpoints.types}`
range-format=`${endpoints.formats}`
range-steps=`${endpoints.steps}`
- range-language=`${endpoints.languages}`
+ range-languages=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-related=`${endpoints.resources}`
range-country=`${endpoints.countries}`
@@ -37,7 +37,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
label-name=`${data.TitleRequired}`
label-country=`${data.Country}`
- label-language=`${data.Language}`
+ label-languages=`${data.Language}`
label-uri=`${data.LocationWeblinkReq}`
label-format=`${data.FormatReq}`
label-fields=`${data.FieldRequired}`
@@ -70,7 +70,8 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
multiple-steps='sib-multiple-select'
widget-steps='sib-form-auto-completion'
- widget-language='sib-form-auto-completion'
+ multiple-languages='sib-multiple-select'
+ widget-languages='sib-form-auto-completion'
multiple-related='sib-multiple-select'
widget-related='sib-form-auto-completion'
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index a92c8227e5df565919212c1cf9b30eb16111f8cf..bc07b486b7d23cbb604c58d74458ddd8ead15716 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -105,9 +105,9 @@ div.block_list
nested-field='resources'
fields='search_for_a_resource(name, description, author),content(name, format.name, publication_year), actions(review.status, detail, edit, delete)',
- search-fields='search_for_a_resource, header_criterias, more_criterias_hidden(format, publication_year, country, language, fields)',
+ search-fields='search_for_a_resource, header_criterias, more_criterias_hidden(format, publication_year, country, languages, fields)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-country=`${endpoints.countries}`
@@ -118,8 +118,8 @@ div.block_list
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-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
@@ -133,7 +133,7 @@ div.block_list
search-label-format=`${data.Format}`
search-label-publication_year=`${data.DatePublication}`
search-label-country=`${data.CountryPublication}`
- search-label-language=`${data.Language}`
+ search-label-languages=`${data.Language}`
search-label-fields=`${data.Field}`
class-name="tit_element_list"
diff --git a/src/includes/mentor/resources/validate.pug b/src/includes/mentor/resources/validate.pug
index 5bfa5461e1525fb3959516d7e76cd77b7a34562e..fab473ee76f36ba9c012187d54d272bcdd048169 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -21,7 +21,7 @@ sib-router
submitter.mentorProfile.organisation.name, skills, uri, broken),\
content(preview_image),\
description, copyright, specifications(\
- header_specifications, resource_author, country.name, language.name,\
+ header_specifications, resource_author, country.name, languages,\
publication_year, fields, sharing)',
widget-submitter='cs-display-mentor-link',
@@ -41,16 +41,14 @@ sib-router
widget-name='cs-display-property'
widget-publication_year='cs-display-resource-property'
widget-sharing='cs-display-resource-property'
- widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
widget-preview_image='cs-preview-picture'
widget-header_specifications='cs-section_header'
label-broken=`${data.ReportBrokenLink}`
- label-sharing=`${data.Access}`
- label-language.name=`${data.Language}`
- label-publication_year=`${data.DatePublication}`
+ label-sharing=`${data.Access}: `
+ label-publication_year=`${data.DatePublication}: `
label-header_specifications=`${data.ResourceSpecifications}`
label-format.name=''
@@ -59,17 +57,22 @@ sib-router
each-label-steps=`${data.Step}`
multiple-steps
+ widget-languages='cs-display-multiple-property'
+ label-languages=`${data.Language}: `
+ each-label-languages=''
+ multiple-languages
+
widget-fields='cs-display-multiple-property'
- label-fields=''
- each-label-fields=`${data.Field}`
+ label-fields=`${data.Field}: `
+ each-label-fields=''
multiple-fields
label-skills=`${data.WithResourceAbleTo}`
label-uri=`${data.LinkToResource}`
name-uri='original-link'
- label-country.name=`${data.Country}`
+ label-country.name=`${data.Country}: `
label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
- label-resource_author=`${data.Author}`
+ label-resource_author=`${data.Author}: `
label-submitter=`${data.ResourcePostedBy}: `
action-broken='resource-report-broken-link-mentor'
)
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index c0ff85dd490726b551aba4e80686c6412fae9223..749eb21625b5fb0c3428a84571120b30f18937da 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -17,7 +17,7 @@
content(preview_image, iframe_link),\
description, review.reviewer.account.picture, review.reviewer,\
copyright, specifications(\
- header_specifications, resource_author, country.name, language.name,\
+ header_specifications, resource_author, country.name, languages,\
publication_year, fields, sharing)',
widget-submitter='cs-display-user-link',
@@ -36,7 +36,6 @@
widget-name='cs-display-property'
widget-publication_year='cs-display-resource-property'
widget-sharing='cs-display-sharing'
- widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
widget-preview_image='cs-preview-picture'
@@ -47,9 +46,8 @@
widget-iframe_link='iframe-video-resource'
label-broken=`${data.ReportBrokenLink}`
- label-sharing=`${data.Access}`
- label-language.name=`${data.Language}`
- label-publication_year=`${data.DatePublication}`
+ label-sharing=`${data.Access}: `
+ label-publication_year=`${data.DatePublication}: `
label-header_specifications=`${data.ResourceSpecifications}`
label-format.name=''
class-format.name='format_type'
@@ -59,17 +57,22 @@
each-label-steps=`${data.Step}`
multiple-steps
+ widget-languages='cs-display-multiple-property'
+ label-languages=`${data.Language}: `
+ each-label-languages=''
+ multiple-languages
+
widget-fields='cs-display-multiple-property'
- label-fields=''
- each-label-fields=`${data.Field}`
+ label-fields=`${data.Field}: `
+ each-label-fields=''
multiple-fields
label-skills=`${data.WithThisResourceBeAbleTo}`
label-uri=`${data.LinkToResource}`
name-uri='original-link'
- label-country.name=`${data.Country}`
+ label-country.name=`${data.Country}: `
label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
- label-resource_author=`${data.Author}`
+ label-resource_author=`${data.Author}: `
label-submitter=`${data.ResourcePostedBy}: `
label-review.reviewer=`${data.ResourceValidatedBy}: `
action-broken='resource-report-broken-link-public'
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index 4a8b77c1d8a127a9d572f41b6f226480564f856f..7b95d1a5b168e5712e37c57ede9ce11dbf4f65a7 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -39,22 +39,22 @@ container.block_list.flex.flex_espace
//- )
sib-form.more_criterias.flex.flex_espace(
data-src=`${endpoints.resources}`,
- fields='header_criterias, format, publication_year, country, language, fields'
+ fields='header_criterias, format, publication_year, country, languages, fields'
label-header_criterias=`${data.Search}`
label-format=`${data.Format}`
label-publication_year=`${data.DatePublication}`
label-country=`${data.CountryPublication}`
- label-language=`${data.Language}`
+ label-languages=`${data.Language}`
label-fields=`${data.Field}`
widget-header_criterias='cs-section_header'
- range-language=`${endpoints.languages}`
+ range-languages=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-format=`${endpoints.formats}`
range-country=`${endpoints.countries}`
- multiple-language='sib-form-dropdown'
- widget-language='sib-form-auto-completion'
+ multiple-languages='sib-form-dropdown'
+ widget-languages='sib-form-auto-completion'
multiple-format='sib-form-dropdown'
widget-format='sib-form-auto-completion'
@@ -109,7 +109,7 @@ container.block_list.flex.flex_espace
fields='name, resource_author, format.name, publication_year, description, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -122,8 +122,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -133,12 +133,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -163,10 +163,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step2}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -179,8 +179,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -190,12 +190,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -221,10 +221,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step3}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -237,8 +237,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -248,12 +248,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -278,10 +278,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step4}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -294,8 +294,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -305,12 +305,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -335,10 +335,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step5}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -351,8 +351,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -362,12 +362,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
@@ -391,10 +391,10 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.step6}`,
- fields='name, resource_author, format.name, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ fields='name, resource_author, format.name, publication_year, description, country, languages, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)',
search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
+ search-range-languages=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
search-range-country=`${endpoints.countries}`
@@ -407,8 +407,8 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-country='sib-form-dropdown'
search-widget-country='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
+ search-multiple-languages='sib-form-dropdown'
+ search-widget-languages='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
@@ -418,12 +418,12 @@ container.block_list.flex.flex_espace
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
- widget-language="hidden-widget"
+ widget-languages="hidden-widget"
widget-resource_author="hidden-widget"
widget-format.name='cs-display-resource-property'
label-format.name=''
- label-language=''
- multiple-language
+ label-languages=''
+ multiple-languages
label-fields=''
multiple-fields
class="panel"
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 071b75c2b7938ca459432250f47b2bb291ea85b2..e521a25344fb099f0c042eb28309a6dadc00f949 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -122,15 +122,23 @@ async function refreshUser(formId, listId) {
if (list) {
let listProxy = await list.component.resource;
- let account = await listProxy['account'];
-
- // Refresh du cache sur le User
listProxy.clearCache();
+
+ list.dataset.src = list.dataset.src;
+ let account = await listProxy['account'];
+ // Refresh du cache sur le account du user
if (account) {
account.clearCache();
}
-
- list.dataset.src = list.dataset.src;
+
+ let profile = await listProxy['entrepreneurProfile'];
+ // Refresh du cache sur le account du user
+ if (profile) {
+ profile.clearCache();
+ } else {
+ profile = await listProxy['mentorProfile'];
+ profile.clearCache();
+ }
}
});
}
@@ -658,7 +666,23 @@ function listenToInputChangeOnResourceCreation(originalForm) {
originalForm.querySelectorAll('select[name="format"]')[0].value != "" &&
originalForm.querySelectorAll('select[name="sharing"]')[0].value != "" &&
originalForm.querySelectorAll('select[name="country"]')[0].value != "" &&
- originalForm.querySelectorAll('select[name="language"]')[0].value != "") {
+ originalForm.querySelectorAll('select[name="languages"]')[0].value != "") {
+ submitInput.disabled = false;
+ submitInput.classList.remove('disabled');
+ } else {
+ submitInput.disabled = true;
+ submitInput.classList.add('disabled');
+ }
+}
+
+function listenToInputChangeOnMentorAccountCompletion(originalForm) {
+ let submitInput = originalForm.querySelectorAll('input[type=submit]')[0];
+ if (originalForm.querySelectorAll('input[name="first_name"]')[0].value != "" &&
+ originalForm.querySelectorAll('input[name="last_name"]')[0].value != "" &&
+ originalForm.querySelectorAll('input[name="mentorProfile.city"]')[0].value != "" &&
+ originalForm.querySelectorAll('select[name="mentorProfile.languages"]')[0].value != "" &&
+ originalForm.querySelectorAll('select[name="mentorProfile.fields"]')[0].value != "" &&
+ originalForm.querySelectorAll('select[name="mentorProfile.country"]')[0].value != "") {
submitInput.disabled = false;
submitInput.classList.remove('disabled');
} else {
@@ -689,36 +713,11 @@ jQuery(document).ready(function($) {
submitInput.classList.add('disabled');
const inputsList = mentorCreationForm.querySelectorAll('input[type="text"]' + ',select');
inputsList.forEach(function(input) {
- input.addEventListener('focusout', (() => {
- let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
- if (mentorCreationForm.querySelectorAll('input[name="first_name"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('input[name="last_name"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('input[name="mentorProfile.city"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('select[name="mentorProfile.languages"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('select[name="mentorProfile.fields"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('select[name="mentorProfile.country"]')[0].value != "") {
- submitInput.disabled = false;
- submitInput.classList.remove('disabled');
- } else {
- submitInput.disabled = true;
- submitInput.classList.add('disabled');
- }
- }));
-
input.addEventListener('change', (() => {
- let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
- if (mentorCreationForm.querySelectorAll('input[name="first_name"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('input[name="last_name"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('input[name="mentorProfile.city"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('select[name="mentorProfile.languages"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('select[name="mentorProfile.fields"]')[0].value != "" &&
- mentorCreationForm.querySelectorAll('select[name="mentorProfile.country"]')[0].value != "") {
- submitInput.disabled = false;
- submitInput.classList.remove('disabled');
- } else {
- submitInput.disabled = true;
- submitInput.classList.add('disabled');
- }
+ listenToInputChangeOnMentorAccountCompletion(mentorCreationForm);
+ }));
+ input.addEventListener('input', (() => {
+ listenToInputChangeOnMentorAccountCompletion(mentorCreationForm);
}));
});
});
@@ -730,10 +729,10 @@ jQuery(document).ready(function($) {
submitInput.classList.add('disabled');
let inputs = mentorResourceCreationForm.querySelectorAll('input[type="text"]' + ',select' + ',textarea');
inputs.forEach(function(input) {
- input.addEventListener('focusout', (() => {
+ input.addEventListener('change', (() => {
listenToInputChangeOnResourceCreation(mentorResourceCreationForm);
}));
- input.addEventListener('change', (() => {
+ input.addEventListener('input', (() => {
listenToInputChangeOnResourceCreation(mentorResourceCreationForm);
}));
});
@@ -746,7 +745,7 @@ jQuery(document).ready(function($) {
submitInput.classList.add('disabled');
let inputs = mentorResourceEditionForm.querySelectorAll('input[type="text"]' + ',select' + ',textarea');
inputs.forEach(function(input) {
- input.addEventListener('focusout', (() => {
+ input.addEventListener('input', (() => {
listenToInputChangeOnResourceCreation(mentorResourceEditionForm);
}));
input.addEventListener('change', (() => {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index cb3475f186bcb3e1395f8f109cf39921c2e6edeb..99d96422c2bb9d9d67bcbdb3ad63350b90ced5d8 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1767,7 +1767,20 @@ sib-set-default[name="specifications"]>sib-multiple{
padding: 2rem 0;
background: var(--bg-form-focus);
margin-top: 1px;
+ label{
+ font-family: 'var(--typo-btn)';
+ text-align: center;
+ margin:0;
+ font-size: 1.4rem;
+ color: var(--clr-roll-black);
+ display: inline;
+ float: none;
+ }
+ &>div {
+ display: inline;
+ }
p{
+ display: inline;
text-align: center;
margin:0;
font-size: 1.4rem;