diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index ea55eab02bd191b0c48251b0bf9440e58b68099a..8c22bbecb20fd6ae51409935be919d829383bc0c 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -150,3 +150,9 @@ sib-widget(name="accordion-request-resource" )
div
h2 ${value}
+sib-widget(name="cs-form-file-custom" )
+ template
+ label(for="preview_image")
+ sib-form-file(upload-url=`${sdn}upload/` name="preview_image")
+
+
diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index c8dc143a7e52ecc69e0b3cdc87d86681f9c83ad0..ccfda50e280d3eefc8f4e76528d13d55e200fb4a 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -26,7 +26,7 @@ sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
widget-username='sib-form-hidden'
upload-url-account.picture=`${sdn}upload/`
- widget-account.picture='sib-form-file'
+ widget-account.picture='cs-form-file-custom'
class-account.picture='input_photo w_25'
submit-button="COMPLETE YOUR ACCOUNT"
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index 9931334e70f2a09393575f0bd359801ec65ca00a..c18664c6a31bfcaffca86172e96f09e304d55eb7 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -23,7 +23,7 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
widget-entrepreneur_profile.organisation='sib-form-auto-completion'
upload-url-account.picture=`${sdn}upload/`
- widget-account.picture='sib-form-file'
+ widget-account.picture='cs-form-file-custom'
class-account.picture='input_photo w_25'
submit-button="Save modifications"
diff --git a/src/includes/entrepreneur/requests/create.pug b/src/includes/entrepreneur/requests/create.pug
index 66f1acf5800619a97d79c481f52bae4fc5bee021..5c5938b29b15f5af7f7f851d0a7f837b4957f5b8 100644
--- a/src/includes/entrepreneur/requests/create.pug
+++ b/src/includes/entrepreneur/requests/create.pug
@@ -22,6 +22,7 @@
range-language=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-organisation=`${endpoints.organisations}`
+ range-country=`${endpoints.countries}`
label-header_mandatory='Mandatory information'
label-header_complementary='Complementary information'
@@ -36,6 +37,7 @@
multiple-fields='sib-multiple-select'
widget-fields='sib-form-auto-completion'
+ widget-country='sib-form-auto-completion'
multiple-language='sib-multiple-select'
widget-language='sib-form-auto-completion'
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index f098a8ae7b3a7659ea977406a9499580e4c1acc7..9f54911f20c29cd2d3eabcdb8fd9c9780c13215b 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -18,14 +18,14 @@ include ../../components/widgets
content(preview_image, tags),\
description, review.reviewer.account.picture, review.reviewer.name,\
copyright, specifications(\
- header_specifications, author, country, language.name,\
+ header_specifications, author, country.name, language.name,\
publication_year, fields, sharing)',
widget-submitter.name='cs-display-resource-property',
class-name="title_form"
class-steps="steps"
widget-author='cs-display-resource-property',
- widget-country='cs-display-resource-property',
+ widget-country.name='cs-display-resource-property',
widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
@@ -67,7 +67,7 @@ include ../../components/widgets
label-skills='With this resource, you will be able to:'
label-uri='Link to resource'
name-uri='original-link'
- label-country='Country:'
+ label-country.name='Country:'
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 03810d91e3e894a40743a0c1b1d5653d47f48ab2..8650cdef6863cd6aa3b0888342fb93cf1f6d53f7 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -52,6 +52,10 @@ container.block_list.flex.flex_espace
range-language=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-format=`${endpoints.formats}`
+ range-country=`${endpoints.countries}`
+
+ multiple-country='sib-form-dropdown'
+ widget-country='sib-form-auto-completion'
multiple-language='sib-form-dropdown'
widget-language='sib-form-auto-completion'
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index a928c174f36fe4114d54d159f2ff98edb8d3bd40..4cc1aa4a261e6324ee7b6e4f540d6d810945d8a4 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -24,6 +24,7 @@ container.block_list.flex.flex_espace
div#resources-mentor-database-loader
hidden
i.fas.fa-spinner.fa-spin
+
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-mentor-database-loader"
@@ -59,6 +60,10 @@ container.block_list.flex.flex_espace
range-language=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-format=`${endpoints.formats}`
+ range-country=`${endpoints.countries}`
+
+ multiple-country='sib-form-dropdown'
+ widget-country='sib-form-auto-completion'
multiple-language='sib-form-dropdown'
widget-language='sib-form-auto-completion'
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index ac6f6079714911298665ee9dc8dad9a87b5a8ed2..677dd802b9e7576e7cde75500cc8189f160028cf 100644
--- a/src/includes/mentor/profile/create.pug
+++ b/src/includes/mentor/profile/create.pug
@@ -21,6 +21,7 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
range-mentor_profile.fields=`${endpoints.fields}`
range-mentor_profile.organisation=`${endpoints.organisations}`
range-mentor_profile.languages=`${endpoints.languages}`
+ range-mentor_profile.country=`${endpoints.countries}`
label-header_about_you="About you"
label-header_social_media="Social medias"
@@ -50,6 +51,7 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
class-mentor_profile.organisation='form-label is-dark'
widget-mentor_profile.organisation='sib-form-auto-completion'
+ widget-mentor_profile.country='sib-form-auto-completion'
class-mentor_profile.languages='form-label is-dark'
multiple-mentor_profile.languages='sib-multiple-select'
@@ -60,7 +62,7 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
widget-mentor_profile.fields='sib-form-auto-completion'
upload-url-account.picture=`${sdn}upload/`
- widget-account.picture='sib-form-file'
+ widget-account.picture='cs-form-file-custom'
class-account.picture='input_photo w_25'
class-headline='w_75'
diff --git a/src/includes/mentor/profile/detail.pug b/src/includes/mentor/profile/detail.pug
index 20d6f09f84cadcd15d3c7f2d321d88f9821a2f53..bdd0091f92a397942d70aded9c71da6becf520f2 100644
--- a/src/includes/mentor/profile/detail.pug
+++ b/src/includes/mentor/profile/detail.pug
@@ -29,12 +29,12 @@ div.block_list.flex
sib-display#mentor_info(
bind-user
- fields='account.picture, name, mentor_profile.headline, mentor_profile.city, mentor_profile.country, registered_on'
+ fields='account.picture, name, mentor_profile.headline, mentor_profile.city, mentor_profile.country.name, registered_on'
widget-account.picture='cs-profile-picture'
widget-name='cs-display-property'
widget-mentor_profile.headline='cs-display-property'
widget-mentor_profile.city='cs-display-property'
- widget-mentor_profile.country='cs-display-property'
+ widget-mentor_profile.country.name='cs-display-property'
widget-mentor_profile.registered_on='cs-display-property'
)
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index cd141ed5dc3382561e795e82f0633c3bf51257fc..c758091c3d4aa339cf511426c51cd48146c4c379 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -52,7 +52,7 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
widget-mentor_profile.fields='sib-form-auto-completion'
upload-url-account.picture=`${sdn}upload/`
- widget-account.picture='sib-form-file'
+ widget-account.picture='cs-form-file-custom'
class-account.picture='input_photo w_25'
class-headline='w_75'
diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug
index 3f72bc8bee0e7fa8f99983496fcbe484442ddf38..b45c0ea5c8e1aebf3ed4b36fcbe05ffbb6927798 100644
--- a/src/includes/mentor/resources/create.pug
+++ b/src/includes/mentor/resources/create.pug
@@ -25,6 +25,7 @@ p.p_entete Thank you for enriching our database !
range-language=`${endpoints.languages}`
range-fields=`${endpoints.fields}`
range-related=`${endpoints.resources}`
+ range-country=`${endpoints.countries}`
label-header_mandatory='Mandatory information'
label-header_complementary='Complementary information'
@@ -74,9 +75,10 @@ p.p_entete Thank you for enriching our database !
widget-description='sib-form-textarea'
widget-skills='sib-form-textarea'
widget-publication_year='sib-form-number'
+ widget-country='sib-form-auto-completion'
upload-url-preview_image=`${sdn}upload/`
- widget-preview_image='sib-form-file'
+ widget-preview_image='cs-form-file-custom'
class-preview_image='input_photo w_25'
submit-button='Send for validation ->'
diff --git a/src/includes/mentor/resources/edit.pug b/src/includes/mentor/resources/edit.pug
index 6827c3aff2e7a913c9ecd616f5cdcc9f2b32b2a6..70fb42a71cd05c53c6d9c0cfc88983715f3aaa28 100644
--- a/src/includes/mentor/resources/edit.pug
+++ b/src/includes/mentor/resources/edit.pug
@@ -25,6 +25,7 @@ p.p_entete Thank you for enriching our database !
range-language=`${endpoints.languages}`
range-field=`${endpoints.fields}`
range-related=`${endpoints.resources}`
+ range-country=`${endpoints.countries}`
label-header_mandatory='Mandatory information'
label-header_complementary='Complementary information'
@@ -54,6 +55,8 @@ p.p_entete Thank you for enriching our database !
label-related='Add a resource'
+ widget-country='sib-form-auto-completion'
+
multiple-field='sib-multiple-select'
widget-field='sib-form-auto-completion'
@@ -76,7 +79,7 @@ p.p_entete Thank you for enriching our database !
widget-publication_year='sib-form-number'
upload-url-preview_image=`${sdn}upload/`
- widget-preview_image='sib-form-file'
+ widget-preview_image='cs-form-file-custom'
class-preview_image='input_photo w_25'
submit-button='Send for validation ->'
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index e701aa3e66e76de3ca6539b62d652fc6f99660eb..7ab4c61c3e6a384f84bf8bfdf2ac3fd3c44e0641 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -95,6 +95,7 @@ div.block_list
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
+ search-range-country=`${endpoints.countries}`
search-label-search_for_a_resource="Search by name..."
search-widget-search_for_a_resource="sib-form-placeholder-text"
@@ -107,6 +108,8 @@ div.block_list
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
+ search-multiple-country='sib-form-dropdown'
+ search-widget-country='sib-form-auto-completion'
widget-review.status='cs-resource-status',
search-widget-header_criterias="cs-section_header"
diff --git a/src/includes/mentor/resources/validate.pug b/src/includes/mentor/resources/validate.pug
index 8565eb3272a8fd490c4485c88f63d0604aa1e1b0..e07ef4ffae43f3099e7e3df158947a70bcc37c1e 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -22,14 +22,14 @@ sib-router
submitter.mentor_profile.organisation.name, skills, uri, broken),\
content(preview_image, tags),\
description, copyright, specifications(\
- header_specifications, author, country, language.name,\
+ header_specifications, author, country.name, language.name,\
publication_year, fields, sharing)',
widget-submitter.name='cs-display-resource-property',
class-name="title_form"
class-steps="steps"
widget-author='cs-display-resource-property',
- widget-country='cs-display-resource-property',
+ widget-country.name='cs-display-resource-property',
widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
@@ -68,7 +68,7 @@ sib-router
label-skills='With this resource, you will be able to:'
label-uri='Link to resource'
name-uri='original-link'
- label-country='Country:'
+ label-country.name='Country:'
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 3d01f88eb2a4daf51e13df80fc75c7c2a802b08c..f90e586242e74d695a73642ea2a0af14e967d881 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -18,14 +18,14 @@ include ../../components/widgets
content(preview_image, tags),\
description, review.reviewer.account.picture, review.reviewer.name,\
copyright, specifications(\
- header_specifications, author, country, language.name,\
+ header_specifications, author, country.name, language.name,\
publication_year, fields, sharing)',
widget-submitter.name='cs-display-resource-property',
class-name="title_form"
class-steps="steps"
widget-author='cs-display-resource-property',
- widget-country='cs-display-resource-property',
+ widget-country.name='cs-display-resource-property',
widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
@@ -67,7 +67,7 @@ include ../../components/widgets
label-skills='With this resource, you will be able to:'
label-uri='Link to resource'
name-uri='original-link'
- label-country='Country:'
+ label-country.name='Country:'
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index c6f73aa0c24a5aa9f05903f2dde13c393b096411..0934d7bcc98300e95a0bbf7bd344d0c3d45af025 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -5,7 +5,6 @@ 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
-
container.block_list.flex.flex_espace
div.w_75.block-g-entre
div
@@ -48,6 +47,7 @@ container.block_list.flex.flex_espace
range-language=`${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'
@@ -57,6 +57,9 @@ container.block_list.flex.flex_espace
multiple-fields='sib-form-dropdown'
widget-fields='sib-form-auto-completion'
+
+ multiple-country='sib-form-dropdown'
+ widget-country='sib-form-auto-completion'
naked
)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 7a0f216e4b59d688df363ea5f20426b51d514f14..8e32a9ad9482dc2d646de019f8631b22a15b1838 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -26,6 +26,21 @@ function openFakeTab(elmnt) {
elmnt.classList.add("active");
}
+function loadFile(event) {
+ var elt = document.createElement("img");
+ elt.src = URL.createObjectURL(event.target.files[0]);
+
+ var labeltag = event.target.closest("label");
+ labeltag.querySelector("input[name='preview_image']").style.display = "none";
+
+ if (labeltag.querySelector("img")) {
+ var oldImage = labeltag.querySelector("img");
+ labeltag.removeChild(oldImage);
+ }
+
+ labeltag.insertAdjacentElement("afterbegin", elt);
+}
+
function linkDatasetToField(detail, targetFormName, inputName) {
let targetForm = document.getElementById(targetFormName);
targetForm.addEventListener("populate", event => {
@@ -133,6 +148,7 @@ function addProperFilterToSearchComponents(targetId) {
var forms = baseElement.querySelectorAll(".resource_by_step");
forms.forEach(form => {
form.addEventListener("populate", e => {
+
//Manage fake tabs
let tabs = baseElement.getElementsByClassName("filter_by_type");
for (let tab of tabs) {
@@ -344,6 +360,7 @@ jQuery(document).ready(function($) {
});
}
+ //Manage the logout action
const logoutButtons = document.getElementsByClassName("logout-button");
for (var i = 0; i < logoutButtons.length; i++) {
logoutButtons[i].addEventListener("click", function() {
@@ -361,50 +378,69 @@ jQuery(document).ready(function($) {
//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");
+ var forms = document.querySelectorAll("sib-form");
+ forms.forEach(form => {
+ form.addEventListener("populate", e => {
+ var previewImage = document.querySelectorAll(
+ "sib-form-file input[name='preview_image']+input"
+ );
+ var previewlabel = document.querySelectorAll(
+ "sib-form-file div"
+ );
+ for (let item of previewlabel) {
+ item.innerHTML="Upload a file"
+ }
- /* 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";
+ for (let item of previewImage) {
+ item.addEventListener("change", loadFile);
}
});
- }
- //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;
+ //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";
+ }
+ });
+ }
- let confirm_suppress = document.getElementById("confirm_suppress");
- confirm_suppress.setAttribute("hidden", "hidden");
+ //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;
- //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" }
- })
- );
- });
- }
+ 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*************************************************************
@@ -418,7 +454,7 @@ jQuery(document).ready(function($) {
acc[i].addEventListener("click", function() {
this.classList.toggle("active");
- var panel = this.nextElementSibling.querySelector("sib-form + div")
+ var panel = this.nextElementSibling.querySelector("sib-form + div");
if (panel.style.maxHeight) {
panel.style.maxHeight = null;
diff --git a/src/styles/index.scss b/src/styles/index.scss
index dcf66d9689d49a83a538170a3e02d3846c5862bc..562fca4e965af1baa21efda316fd092117f6fe1e 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1555,7 +1555,7 @@ cs-display-property[name="name"] p{
margin: 0;
}
-cs-display-property[name="mentor_profile.country"] p{
+cs-display-property[name="mentor_profile.country.name"] p{
clear: both;
}