diff --git a/src/images/asid_entre.png b/src/images/asid_entre.png
index 5cbad5cd4b10fe82760dd53c805a380c82736728..4806e10220b6ca7046d33980f740d2fe8b45ce00 100644
Binary files a/src/images/asid_entre.png and b/src/images/asid_entre.png differ
diff --git a/src/images/fusee.png b/src/images/fusee.png
index a62c3d3744790d8a492c9ad12f21b2dcfdc3a506..3289175205498f4bb3ee3b6d55bfc3e7505e34c9 100644
Binary files a/src/images/fusee.png and b/src/images/fusee.png differ
diff --git a/src/images/mentor-2.png b/src/images/mentor-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..be54ee019b949aacdbf776ada9116a1f1da57f67
Binary files /dev/null and b/src/images/mentor-2.png differ
diff --git a/src/images/mentor.png b/src/images/mentor.png
index 170ed9884125c483111ae36e262ea2d94bd705a6..825f277c144dda1c3b55e5ae872c336bb14a2da9 100644
Binary files a/src/images/mentor.png and b/src/images/mentor.png differ
diff --git a/src/images/mentor_back.png b/src/images/mentor_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..170ed9884125c483111ae36e262ea2d94bd705a6
Binary files /dev/null and b/src/images/mentor_back.png differ
diff --git a/src/images/valid_1.png b/src/images/valid_1.png
index bb575cf4cd053712f926078d259352fac175875f..ef994c61a08cd8493062483f89c1245f24f05277 100644
Binary files a/src/images/valid_1.png and b/src/images/valid_1.png differ
diff --git a/src/images/valid_2.png b/src/images/valid_2.png
index 3c88101d63b597cf8cb8943b2317777d02e45120..f2c7f19a127fbd32dd6ae10c5645061f0db8a69e 100644
Binary files a/src/images/valid_2.png and b/src/images/valid_2.png differ
diff --git a/src/images/valid_3.png b/src/images/valid_3.png
index f0637254cca41c3435fd8f06541e301ea8880a55..39da43d1eaa577dc03ac5a7698be601e12fb18ca 100644
Binary files a/src/images/valid_3.png and b/src/images/valid_3.png differ
diff --git a/src/images/valid_4.png b/src/images/valid_4.png
index 21d6eac83d231cf24399818e0a03e51af1e2aadf..7f9274e9118f0191278567e03e99af8c60b80ad0 100644
Binary files a/src/images/valid_4.png and b/src/images/valid_4.png differ
diff --git a/src/images/valid_4_back.png b/src/images/valid_4_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d6eac83d231cf24399818e0a03e51af1e2aadf
Binary files /dev/null and b/src/images/valid_4_back.png differ
diff --git a/src/images/valid_5.png b/src/images/valid_5.png
index 26060ae9a7c235d59504940c088241d664b2017b..717de7d4fe329390b98d178daeaac1fe8388afaa 100644
Binary files a/src/images/valid_5.png and b/src/images/valid_5.png differ
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index cbca0ef4a82078244c1506e5668c2f514fc64b5b..b9268166c96d26f29fa5fc8269366a374f3a418c 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -226,6 +226,10 @@ solid-widget(name="accordion-request-resource")
div
h2 ${value}
+solid-widget(name="cs-empty-widget")
+ template
+ p No related resources
+
solid-widget(name="cs-display-twitter-button")
template
a.twitter-share-button(
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index fa9b850a69626b4edcf9cd665c44186396be177d..50a8d3b235357719543b7fc6b89ccd8fc5f23d34 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -9,10 +9,6 @@ div.container_min
button.button_dark.pull-right=`${data.WatchThePresentation}`
i.far.fa-play-circle
-//-About :
-//It will be great to have autocompletion on country
-//I'm waiting for a confirmation to suppress step field
-
container.block_list
div.flex.flex_espace
div.w_75.block-g-entre
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index 1111301996ea7fc9101ff3b3a0608cb27cbfb272..3c4a4faa6b278384752c3f0c06c44eafa7a0dfe9 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -47,10 +47,14 @@ section#home
solid-display(
bind-resources
fields="related"
+
multiple-related
multiple-related-fields='name'
multiple-related-next="mentor-resource-detail"
label-related=''
+
+ empty-widget="cs-empty-widget"
+ empty-value="add-user"
)
#mentor-database(hidden).no-sidebar.container
@@ -74,6 +78,7 @@ section#home
solid-display(
bind-resources
fields="related"
+ empty-widget="cs-empty-widget"
multiple-related='cs-display-mentor-database-related'
multiple-related-fields='name, value'
label-related=''
diff --git a/src/includes/mentor/resources/database.pug b/src/includes/mentor/resources/database.pug
index 9a792b2eb185811cd65548d5ea985b3ffe127bf7..6f405cacf76ce86d31f0245638e6e3cd69be50cb 100644
--- a/src/includes/mentor/resources/database.pug
+++ b/src/includes/mentor/resources/database.pug
@@ -46,8 +46,8 @@ container.block_list.flex.flex_espace
//- )
solid-form-search.more_criterias.flex.flex_espace(
id="database-filter-form"
- data-src=`${endpoints.resources}`,
- fields='name, format, publication_year, country, languages, fields, type'
+ data-src=`${endpoints.resources}`
+ fields='keyword(name), format, publication_year, country, languages, fields, type'
label-header_criterias=`${data.MoreCriterias}`
label-format=`${data.Format}`
@@ -63,12 +63,13 @@ container.block_list.flex.flex_espace
range-country=`${endpoints.countries}`
range-type=`${endpoints.types}`
- class-name='w_100'
+ class-keyword='w_100'
widget-type='solid-form-dropdown-label'
widget-country='solid-form-dropdown-label'
widget-languages='solid-form-dropdown-label'
widget-format='solid-form-dropdown-label'
widget-fields='solid-form-dropdown-label'
+ widget-name="solid-form-placeholder-label-text"
naked
)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 4f2c29878452565dde6e423dac000ebbb5f8b109..dc98e03c0e822af64899d11eb8efd58e0a9440ef 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -431,17 +431,19 @@ async function selectProperLanguage() {
solidForm.addEventListener("populate", async function(e) {
let languageSelect = e.target.querySelector("select[name='languages']");
var chosenPrefix = window.location.pathname.split('/')[1];
- let languagesList = await solidForm.component.resource['ldp:contains'];
- languagesList.forEach(async (resource) => {
- let resourceCode = await resource['code'];
- let resourceId = await resource['@id'];
- Array.from(languageSelect.options).forEach(function(option_element) {
- if ((resourceCode.toLowerCase() === chosenPrefix) &&
- option_element.value === '{"@id": "' + resourceId + '"}') {
- option_element.selected = true;
- }
+ if (solidForm.component.resource) {
+ let languagesList = await solidForm.component.resource['ldp:contains'];
+ languagesList.forEach(async (resource) => {
+ let resourceCode = await resource['code'];
+ let resourceId = await resource['@id'];
+ Array.from(languageSelect.options).forEach(function(option_element) {
+ if ((resourceCode.toLowerCase() === chosenPrefix) &&
+ option_element.value === '{"@id": "' + resourceId + '"}') {
+ option_element.selected = true;
+ }
+ });
});
- });
+ }
});
}
}