From 3b21a0c9e1c89babd0275d70565fe62d8dd61bb3 Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni <benoit@happy-dev.fr> Date: Sun, 5 Jul 2020 17:04:35 +0200 Subject: [PATCH] Adding organisation additional information if needed --- src/includes/mentor/profile/create.pug | 18 +++++++++++------- translation/en.yml | 3 +++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug index 6ee3cbf2..983c6d7e 100644 --- a/src/includes/mentor/profile/create.pug +++ b/src/includes/mentor/profile/create.pug @@ -11,25 +11,29 @@ h2.title_create= data.CompleteContributorAccount solid-form#mentor_profile_creation.block_log.block_creat_count( bind-user partial - fields="account_information(last_name, first_name, mentorProfile.organisation,\ - mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\ - aboutfields, about_you(header_about_you, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\ + fields="account_information(last_name, first_name, mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\ + aboutfields, organisation_info(header_organisation_info, mentorProfile.organisation, mentorProfile.organisationName,mentorProfile.organisationContact),\ + about_you(header_about_you, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\ mentorProfile.biography, mentorProfile.skills),\ social_media(header_social_media, mentorProfile.linkedin, mentorProfile.twitter), username" - + range-mentorProfile.fields=`${endpoints.fields}` range-mentorProfile.organisation=`${endpoints.organisations}` range-mentorProfile.languages=`${endpoints.languages}` range-mentorProfile.country=`${endpoints.countries}` label-header_about_you=`${data.AboutYou}` + label-header_organisation_info=`${data.AboutYourOrganisation}` + label-mentorProfile.organisationContact=`${data.OtherOrganisationContact}` + label-mentorProfile.organisationName=`${data.OtherOrganisationName}` label-aboutfields=`${data.AboutField}` label-header_social_media=`${data.SocialMedias}` - + + widget-header_organisation_info="cs-section_header" widget-header_social_media="cs-section_header" widget-header_about_you="cs-section_introduction" widget-aboutfields="cs-about-field" - + label-first_name=`${data.Surname} *` label-last_name=`${data.Name} *` label-mentorProfile.organisation=`${data.Organisation} *` @@ -49,7 +53,7 @@ solid-form#mentor_profile_creation.block_log.block_creat_count( widget-mentorProfile.biography="solid-form-textarea" widget-username="solid-form-hidden" - class-mentorProfile.organisation='form-label is-dark' + class-mentorProfile.organisation='form-label is-dark w_100' widget-mentorProfile.organisation='solid-form-auto-completion' widget-mentorProfile.country='solid-form-auto-completion' diff --git a/translation/en.yml b/translation/en.yml index f48c6d41..b226ee2f 100644 --- a/translation/en.yml +++ b/translation/en.yml @@ -143,3 +143,6 @@ ImprovementNotice : A contributor has send you this improvement suggestion AddAComment: Add a comment YourMessageHere: Your message here BackToAccount: Back to My Account +OtherOrganisationContact: If you chose Other, please specify contact email +OtherOrganisationName: If you chose Other, please specify organisation name +AboutYourOrganisation: About your organisation -- GitLab