diff --git a/src/includes/account-creation.pug b/src/includes/account-creation.pug
index 0d783b577406e787a00ca8b07d1834e69fb1f3b6..625a5d32952b3230bfd097f8d1f066accbfd644e 100644
--- a/src/includes/account-creation.pug
+++ b/src/includes/account-creation.pug
@@ -5,21 +5,21 @@ sib-router(default-route='account-creation-index')
#account-creation-index(hidden).flex
figure(class="logo")
- img(src="../images/logo.png" alt="Coopstarter logo")
+ img(src=`${client_domain}/images/logo.png` alt="Coopstarter logo")
h2.title_lead=`${data.welcome}`
sib-link.block_log(next='mentor-new-account')
div
figure.img_log
- img(src="../images/mentor.png"
+ img(src=`${client_domain}/images/mentor.png`
alt="Create your account as mentor")
h2.button_base=`${data.IAmContributor}`
sib-link.block_log(next='entrepreneur-new-account')
div
figure.img_log
- img(src="../images/fusee.png"
+ img(src=`${client_domain}/images/fusee.png`
alt="Create your account as entrepreneur")
h2.button_base=`${data.IAmSearcher}`
diff --git a/src/includes/entrepreneur/components/header.pug b/src/includes/entrepreneur/components/header.pug
index 1a6790b13c22cfa92da7f7114ccc4b424b717d37..090a10c20a9ee3b5a1f19d9ca1d286e6e1608d65 100644
--- a/src/includes/entrepreneur/components/header.pug
+++ b/src/includes/entrepreneur/components/header.pug
@@ -2,7 +2,7 @@
.flex.flex_espace.flex_item_center
sib-link(next='entrepreneur-resource-list')
figure.logo_head.margin_bord_ecran
- img(src="../images/logo_head.png" alt="Coopstarter")
+ img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter")
include menu.pug
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 6d50f78ef44ed7be143bd0a39fb6213cdfcf78a6..c4cae05cc9f17f3cc864fb7aa590f09c26bf5198 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -45,3 +45,5 @@ section#home
include profile/view.pug
+footer#footer
+ include ./../footer.pug
diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index 7e9412f90bf4450d42ab0c677bd499ce6ea10a11..c1bd00b4d7882faf45a58b1a1ec44ef39f708e75 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -1,9 +1,9 @@
figure.logo
- img(src="../images/logo.png"
+ img(src=`${client_domain}/images/logo.png`
alt="Coopstarter")
figure.logo.img_log
- img(src="../images/fusee.png"
+ img(src=`${client_domain}/images/fusee.png`
alt="Create an entrepreneur account")
h2.title_create=`${data.CompleteSearcherAccount}`
@@ -17,6 +17,7 @@ sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
label-first_name=`${data.Surname}`
label-last_name=`${data.Name}`
+ label-account.picture=`${data.Photo}`
label-entrepreneurProfile.organisation=`${data.Organisation}`
class-entrepreneurProfile.organisation='form-label is-dark'
diff --git a/src/includes/entrepreneur/requests/create.pug b/src/includes/entrepreneur/requests/create.pug
index 924e4b948bacaab35e7b90b38e1a6f5c57c91379..95e1b7770190faa60cfe784c68fd11be03ccf41e 100644
--- a/src/includes/entrepreneur/requests/create.pug
+++ b/src/includes/entrepreneur/requests/create.pug
@@ -10,7 +10,7 @@
h2.title_form=`${data.RequestRessource}`
p.p_entete=`${data.RequestRessourceInfo}`
- img(src="../images/asid_entre.png" alt="Rechercher des ressources")
+ img(src=`${client_domain}/images/asid_entre.png` alt="Rechercher des ressources")
sib-form#request-creation-form(
loader-id="request-creation-form-loader"
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index aa872bb8eca74a55a5d12523dea3d2c09974cf8c..f8692e7027b96a517d076bbf04285aa0d44ebb9a 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -75,7 +75,7 @@ container.block_list
div.w_25
div.block_aside_entre
- img(src="../images/asid_entre.png" alt="rechercher de ressources")
+ img(src=`${client_domain}/images/asid_entre.png` alt="Rechercher des ressources")
p=`${data.CantFindRessourceYouNeed}`
div.button__actions
sib-link(next='entrepreneur-request-create')
diff --git a/src/includes/footer.pug b/src/includes/footer.pug
index c44d671144354581e0a440007073c6fef9bc4155..3bf3ec990474b213d9e47edc9ba69ff90bf9362e 100644
--- a/src/includes/footer.pug
+++ b/src/includes/footer.pug
@@ -2,20 +2,20 @@
.flex.flex_espace.flex_item_center
a.logo_footer(href='https://coopseurope.coop/')
figure.margin_bord_ecran
- img(src="../images/logo_CE.png" alt="Coopstarter")
+ img(src=`${client_domain}/images/logo_CE.png` alt="Cooperatives Europe")
a.logo_footer(href='mentor-resource-list')
figure.margin_bord_ecran
- img(src="../images/logo_coops4dev.jpg" alt="Coopstarter")
+ img(src=`${client_domain}/images/logo_coops4dev.jpg` alt="Coops 4 Dev logo")
a.logo_footer(href='mentor-resource-list')
figure.flex.flex_item_center
- img.textMore(src="../images/ica_logo.png" alt="Coopstarter")
+ img.textMore(src=`${client_domain}/images/ica_logo.png` alt="International Cooperative Alliance logo")
div
p International
p Co-operative
p Alliance
a.logo_footer(href='mentor-resource-list')
figure.flex.flex_item_center
- img.textMore(src="../images/logo_UE.jpg" alt="Coopstarter")
+ img.textMore(src=`${client_domain}/images/logo_UE.jpg` alt="European Union Logo")
div
p Co-funded
p by the
diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 33b1b3ef8bf1ed17eed758f89e06c60093a93181..5781831ddcc22f544451dd85060879548b7db8cf 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -2,7 +2,7 @@
.flex.flex_espace.flex_item_center
sib-link(next='mentor-resource-list')
figure.logo_head.margin_bord_ecran
- img(src="../images/logo_head.png" alt="Coopstarter")
+ img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter")
include menu.pug
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index 14da13460e7aac652d8e7f3ea8041cd0813ab83b..c8ee681807bae02d7ecb0f2bedbabf8ba2f9c483 100644
--- a/src/includes/mentor/profile/create.pug
+++ b/src/includes/mentor/profile/create.pug
@@ -1,9 +1,9 @@
figure.logo
- img(src="../images/logo.png"
+ img(src=`${client_domain}/images/logo.png`
alt="Coopstarter")
figure.logo.img_log
- img(src="../images/mentor.png"
+ img(src=`${client_domain}/images/mentor.png`
alt="Create a mentor account")
h2.title_create= data.CompleteContributorAccount
@@ -28,17 +28,17 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
widget-header_social_media="cs-section_header"
widget-header_about_you="cs-section_introduction"
- label-first_name=`${data.Surname}`
- label-last_name=`${data.Name}`
- label-mentorProfile.organisation=`${data.Organisation}`
+ label-first_name=`${data.Surname} *`
+ label-last_name=`${data.Name} *`
+ label-mentorProfile.organisation=`${data.Organisation} *`
label-mentorProfile.phone=`${data.PhoneNumber}`
- label-mentorProfile.languages=`${data.Language}`
- label-mentorProfile.fields=`${data.Field}`
+ label-mentorProfile.languages=`${data.Language} *`
+ label-mentorProfile.fields=`${data.Field} *`
label-account.picture=`${data.Photo}`
label-mentorProfile.headline=`${data.Headline}`
class-mentorProfile.headline="w_75"
- label-mentorProfile.city=`${data.City}`
- label-mentorProfile.country=`${data.Country}`
+ label-mentorProfile.city=`${data.City} *`
+ label-mentorProfile.country=`${data.Country} *`
label-mentorProfile.biography=`${data.ActivitiesMore}`
label-mentorProfile.skills=`${data.SkillForSearcher}`
label-mentorProfile.linkedin="Linkedin"
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index 7be96a993ea19e0840f8c420f565fe3983c0e6e3..f0c7efba5a4325b0f7a1bb158613176536de4d66 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -26,7 +26,6 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
label-mentorProfile.phone=`${data.PhoneNumber}`
label-mentorProfile.languages=`${data.Language}`
label-mentorProfile.fields=`${data.Field}`
- label-account.picture=`${data.Photo}`
label-mentorProfile.headline=`${data.Headline}`
class-mentorProfile.headline="w_75"
label-mentorProfile.city=`${data.City}`
@@ -57,6 +56,7 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
upload-url-account.picture=`${sdn}upload/`
widget-account.picture='cs-form-profile-picture'
class-account.picture='input_photo w_25'
+ label-account.picture=`${data.Photo}`
class-headline='w_75'
submit-button=`${data.SaveModification}`
diff --git a/src/includes/mentor/validation-process.pug b/src/includes/mentor/validation-process.pug
index 9fc2df9310f205819876810e586d14667db47518..6e8fe997a652a5e0ea72f4922d73a032e7348a75 100644
--- a/src/includes/mentor/validation-process.pug
+++ b/src/includes/mentor/validation-process.pug
@@ -5,27 +5,27 @@ div.block_log.block_creat_count.no_shadow
h2=`${data.WhatValidationProcess}`
div.flex.w_100
figure.w_50
- img( src="../images/valid_1.png"
+ img( src=`${client_domain}/images/valid_1.png`
alt="")
figcaption.w_75=`${data.ContributorUploadResourceToDatabase}`
figure.w_50
- img( src="../images/valid_2.png"
+ img( src=`${client_domain}/images/valid_2.png`
alt="")
figcaption.w_75=`${data.ResourceSentToQualifiedPeersForValidation}`
figure.w_33
- img( src="../images/valid_3.png"
+ img( src=`${client_domain}/images/valid_3.png`
alt="")
figcaption.w_75=`${data.ResourceBecomesAvailableInDatabase}`
figure.w_33
- img( src="../images/valid_4.png"
+ img( src=`${client_domain}/images/valid_4.png`
alt="")
figcaption.w_75=`${data.ResourceIsNotValidated}`
figure.w_33
- img( src="../images/valid_5.png"
+ img( src=`${client_domain}/images/valid_5.png`
alt="")
figcaption.w_75=`${data.ResourceReportedInapropriate}`
\ No newline at end of file
diff --git a/src/includes/public/components/header.pug b/src/includes/public/components/header.pug
index 764b71c855ded83bbb042653d96eb19cc9b52133..4502d3889b0ed41f51135acfa58ea15c9031373e 100644
--- a/src/includes/public/components/header.pug
+++ b/src/includes/public/components/header.pug
@@ -2,7 +2,7 @@
.flex.flex_espace.flex_item_center
sib-link(next='public-resource-list')
figure.logo_head.margin_bord_ecran
- img(src="../images/logo_head.png" alt="Coopstarter")
+ img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter")
include menu.pug
diff --git a/src/includes/public/dashboard.pug b/src/includes/public/dashboard.pug
index ae990f15bb397e55214dedb584f0714d1bb1c100..ef5178c3abf489ec9c9f0a958550d54b4054c56c 100644
--- a/src/includes/public/dashboard.pug
+++ b/src/includes/public/dashboard.pug
@@ -20,7 +20,8 @@ section#home
#user-account-view(hidden).no-sidebar.container
include profile/view.pug
-
+footer#footer
+ include ./../footer.pug
diff --git a/src/includes/splash.pug b/src/includes/splash.pug
index 23f0b1a8fe6c27a2952e707b468e698d2d8b68b2..1f97a1fb6a5fa3b1aace558c4d7d400abbfdd04b 100644
--- a/src/includes/splash.pug
+++ b/src/includes/splash.pug
@@ -2,13 +2,13 @@ sib-router(default-route='splash-index')
sib-route(name='splash-index')
figure(class="logo")
- img(src="../images/logo.png" alt="Coopstarter logo")
+ img(src=`${client_domain}/images/logo.png` alt="Coopstarter logo")
h2.title_lead=`${data.welcome}`
#splash-index(hidden).no-sidebar.block_log.flex.loggin
figure.img_log
- img(src="../images/mentor.png"
+ img(src=`${client_domain}/images/mentor.png`
alt="Connect as mentor")
cs-login(bind-user)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 9421d3999775e3384226e0527fbe26c654b9cea0..1f7f039e085e666a910b89fe0d858c59c7c7635a 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -590,6 +590,28 @@ jQuery(document).ready(function($) {
}, 2000);
});
+ const mentorCreationForm = document.getElementById('mentor_profile_creation');
+ mentorCreationForm.addEventListener("populate", e => {
+ let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
+ submitInput.disabled = true;
+ submitInput.classList.add('disabled');
+ const textInputs = mentorCreationForm.querySelectorAll('input[type="text"]');
+ textInputs.forEach(function(text_input) {
+ text_input.addEventListener('focusout', (() => {
+ 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 != "") {
+ let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
+ submitInput.disabled = false;
+ submitInput.classList.remove('disabled');
+ }
+ }));
+ });
+ });
+
//Set the share links
$(".twitter-link").on("populate", function (e) {
var regexContributor = /mentor/g
@@ -634,20 +656,22 @@ jQuery(document).ready(function($) {
refreshList("improvement_dialog_form", "pending_resources");
refreshList("entrepreneur_profile_creation", "entrepreneur_info");
refreshList("entrepreneur_profile_creation", "entrepreneur_contact");
- initFileUpload("entrepreneur_profile_creation", "account.picture");
refreshList("entrepreneur_profile_creation", "entrepreneur_account_picture");
+ initFileUpload("entrepreneur_profile_creation", "account.picture");
refreshList("mentor_profile_creation", "mentor_info");
- initFileUpload("mentor_profile_creation", "account.picture");
refreshList("mentor_profile_creation", "mentor_complementary");
refreshList("mentor_profile_creation", "mentor_contact");
refreshList("mentor_profile_creation", "user_account_picture");
+ initFileUpload("mentor_profile_creation", "account.picture");
refreshList("entrepreneur_profile_edition", "entrepreneur_info");
refreshList("entrepreneur_profile_edition", "entrepreneur_contact");
refreshList("entrepreneur_profile_edition", "entrepreneur_account_picture");
+ initFileUpload("entrepreneur_profile_edition", "account.picture");
refreshList("mentor_profile_edition", "mentor_info");
refreshList("mentor_profile_edition", "mentor_complementary");
refreshList("mentor_profile_edition", "mentor_contact");
refreshList("mentor_profile_edition", "user_account_picture");
+ initFileUpload("mentor_profile_edition", "account.picture");
refreshList("change_status_request", "request_list");
addProperFilterToSearchComponents("entrepreneur-resource-list");
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 410a1f0ed79d6a79019c097d7b7e967ccfed63c6..bba7c75542d7e2c20a2b6b4d090f0dfe58601d2b 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -227,6 +227,11 @@ body{
box-shadow: none;
}
+input[type="submit"].disabled {
+ pointer-events: none;
+ opacity: .35;
+}
+
.button_base, input[type="submit"], #mentor-resource-detail a, #entrepreneur-resource-detail a,
#mentor-resource-validate a, .sib-conversation form input[type="submit"],
#public-resource-detail a, #mentor-database-resource-detail a{
@@ -2379,11 +2384,11 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
width: 1em;
height: 1em;
margin-top: -0.5em;
- -webkit-animation: spinner 150ms infinite linear;
- -moz-animation: spinner 150ms infinite linear;
- -ms-animation: spinner 150ms infinite linear;
- -o-animation: spinner 150ms infinite linear;
- animation: spinner 150ms infinite linear;
+ -webkit-animation: spinner 2000ms infinite linear;
+ -moz-animation: spinner 2000ms infinite linear;
+ -ms-animation: spinner 2000ms infinite linear;
+ -o-animation: spinner 2000ms infinite linear;
+ animation: spinner 2000ms infinite linear;
border-radius: 0.5em;
-webkit-box-shadow: rgba(255,255,255, 0.75) 1.5em 0 0 0, rgba(255,255,255, 0.75) 1.1em 1.1em 0 0, rgba(255,255,255, 0.75) 0 1.5em 0 0, rgba(255,255,255, 0.75) -1.1em 1.1em 0 0, rgba(255,255,255, 0.75) -1.5em 0 0 0, rgba(255,255,255, 0.75) -1.1em -1.1em 0 0, rgba(255,255,255, 0.75) 0 -1.5em 0 0, rgba(255,255,255, 0.75) 1.1em -1.1em 0 0;
box-shadow: rgba(255,255,255, 0.75) 1.5em 0 0 0, rgba(255,255,255, 0.75) 1.1em 1.1em 0 0, rgba(255,255,255, 0.75) 0 1.5em 0 0, rgba(255,255,255, 0.75) -1.1em 1.1em 0 0, rgba(255,255,255, 0.75) -1.5em 0 0 0, rgba(255,255,255, 0.75) -1.1em -1.1em 0 0, rgba(255,255,255, 0.75) 0 -1.5em 0 0, rgba(255,255,255, 0.75) 1.1em -1.1em 0 0;