From 96df913f90bfe7147dab199e97d355bb27ff4502 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Dec 2019 11:13:55 +0100
Subject: [PATCH 1/7] Add a explanation on request list in mentor dashboard.
---
src/includes/mentor/resources/list.pug | 3 +++
translation/en.yml | 3 ++-
translation/fr.yml | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index f3727fe1..dd9c082b 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -65,6 +65,9 @@ div.block_list
div#loader-requests-mentor
hidden
i.fas.fa-spinner.fa-spin
+
+ div
+ p=`${data.RequestIntro}`
sib-display#request-list.request_accordion(
loader-id="loader-requests-mentor"
data-src=`${endpoints.requests}`
diff --git a/translation/en.yml b/translation/en.yml
index 1cf85832..f36f4d2c 100644
--- a/translation/en.yml
+++ b/translation/en.yml
@@ -113,4 +113,5 @@ SubmitterWillReceiveReview: The submitter of the resource will now receive a not
HeWillPatch : He will then be able to patch and send back the resource to validation
ExplainReasonsRefusal: Explain reasons of refusal*
IAmMentor: I am a mentor
-IAmEntrepreneur: I am an entrepreneur
\ No newline at end of file
+IAmEntrepreneur: I am an entrepreneur
+RequestIntro: The resources listed bellow were requested by entrepreneurs. By posting related resources you will help the cooperative community and enrich the database.
\ No newline at end of file
diff --git a/translation/fr.yml b/translation/fr.yml
index f250ae8a..7be77fab 100644
--- a/translation/fr.yml
+++ b/translation/fr.yml
@@ -108,3 +108,4 @@ HeWillPatch : Il pourra alors corriger et renvoyer la ressource à la validation
ExplainReasonsRefusal: Expliquez les raisons du refus*.
IAmMentor: Je suis un mentor
IAmEntrepreneur: je suis un entrepreneur
+RequestIntro: Les ressources listées ci-dessous ont été demandées par des entrepreneurs. En publiant des ressources connexes, vous aiderez la communauté coopérative et enrichirez la base de données.
\ No newline at end of file
--
GitLab
From 6aa2758521b530c34c9ed186b1d633aafd348b74 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Dec 2019 11:32:54 +0100
Subject: [PATCH 2/7] add : on history mentor
---
src/includes/mentor/resources/list.pug | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index dd9c082b..1b51a80b 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -137,13 +137,13 @@ div.block_list
class-name="tit_element_list"
widget-format.name='cs-display-resource-property'
- label-format.name=`${data.Format}`
+ label-format.name=`${data.Format} : `
class-format.name="contenu_list"
class-publication_year="contenu_list"
widget-publication_year='cs-display-resource-property'
- label-publication_year=`${data.DatePublication}`
+ label-publication_year=`${data.DatePublication} : `
class-content='content__left'
class-actions='actions__right'
--
GitLab
From 33120ec4e966e64e6a8295ac534b41d4a673b178 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Dec 2019 11:54:20 +0100
Subject: [PATCH 3/7] orthographe fix.
---
translation/fr.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/translation/fr.yml b/translation/fr.yml
index 7be77fab..20e1e6b9 100644
--- a/translation/fr.yml
+++ b/translation/fr.yml
@@ -15,7 +15,7 @@ HistoryResources : Historique de vos ressources
ConnectKnowledgeBase : Connexion à la base de connaissances
AccessWithoutRegistration : Accès sans inscription
SearchByNam : Rechercher par nom
-MoreCriterias : PLus de critère
+MoreCriterias : Plus de critère
Language : Langue
CountryPublication : Pays de publication
Photo: Avatar
--
GitLab
From 0bfd7d0824b0b7068bc07b40ef2514d3db12a0da Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Dec 2019 15:09:16 +0100
Subject: [PATCH 4/7] little fix en label
---
src/includes/entrepreneur/requests/create.pug | 2 +-
src/includes/mentor/resources/detail.pug | 16 ++++++++--------
translation/fr.yml | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/includes/entrepreneur/requests/create.pug b/src/includes/entrepreneur/requests/create.pug
index 8291703f..b52e0674 100644
--- a/src/includes/entrepreneur/requests/create.pug
+++ b/src/includes/entrepreneur/requests/create.pug
@@ -33,7 +33,7 @@
label-description=`${data.Description}`
label-language=`${data.Language}`
label-country=`${data.Country}`
- label-field=`${data.FieldRequired}`
+ label-fields=`${data.FieldRequired}`
label-organisation=`${data.Organisation}`
label-skills=`${data.SkillToLearn}`
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 17831929..5718b733 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -47,9 +47,9 @@
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-language.name=`${data.Language} : `
+ label-publication_year=`${data.DatePublication} : `
label-header_specifications=`${data.ResourceSpecifications}`
label-format.name=''
widget-iframe_link='iframe-video-resource'
@@ -61,16 +61,16 @@
widget-fields='cs-display-multiple-property'
label-fields=''
- each-label-fields=`${data.Field}`
+ each-label-fields=`${data.Field} : `
multiple-fields
label-skills=`${data.WithThisResourceBeAbleTo}`
label-uri=`${data.LinkToResource}`
name-uri='original-link'
- label-country=`${data.Country}`
- label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
- label-author=`${data.Author}`
- label-submitter.name=`${data.ResourcePostedBy}`
+ label-country=`${data.Country} : `
+ label-submitter.mentorProfile.organisation.name=`${data.Organisation} : `
+ label-author=`${data.Author} : `
+ label-submitter.name=`${data.ResourcePostedBy} : `
action-broken='resource-report-broken-link-mentor'
)
diff --git a/translation/fr.yml b/translation/fr.yml
index 20e1e6b9..9194030a 100644
--- a/translation/fr.yml
+++ b/translation/fr.yml
@@ -47,7 +47,7 @@ Organisation: Organisation
EditAbout : Des informations apparaîtront sur votre profil pour informer les entrepreneurs de vos compétences et de vos activités. Nous utiliserons également ces informations pour adresser des ressources spécifiques pour la validation.
Headline : Titre ou position actuelle
City : Ville
-Country : Pays
+Country : Pays de publication
ActivitiesMore : Parlez-nous de vos activités
SkillForEntrepreneur : Quelles compétences pouvez-vous partager avec nos entrepreneurs ?
SocialMedias : Médias sociaux
@@ -59,9 +59,9 @@ CompleteEntrepreneurAccount : Completer votre compte entrepreneur
CompleteYourAccount : Completer votre compte
RequestRessource : Demander une ressource
RequestRessourceInfo : Vous ne trouvez pas la ressource que vous recherchez ? Vous avez besoin de ressources pour acquérir certaines compétences ou progresser dans votre développement coopératif ? Il peut s'agir d'un livre, d'un modèle de document, d'un tutoriel, de tout ce dont vous avez besoin, faites une demande à nos mentors pour qu'ils sachent comment vous aider.
-Title* : Title*
+TitleRequired : Titre*
Description : Description
-Field*: Domaine*
+FieldRequired: Domaine*
SkillToLearn : Que devez-vous apprendre avec cette ressource ?
SendRequest : Envoyer la demande
MandatoryInformation : Informations obligatoires
--
GitLab
From 313aaa5786c2c124f01044b2d67f2252309852d2 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Dec 2019 15:09:50 +0100
Subject: [PATCH 5/7] Hide resource related since it's not ready
---
.../entrepreneur/resources/detail.pug | 22 +++++++++----------
src/includes/mentor/resources/detail.pug | 22 +++++++++----------
src/includes/public/resources/detail.pug | 22 +++++++++----------
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 6469a8c5..faf54deb 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -119,18 +119,18 @@
nested-field="conversations"
)
- h2.title_lead_avenir=`${data.RelatedResources}`
+ //- h2.title_lead_avenir=`${data.RelatedResources}`
- sib-display(
- bind-resources,
- nested-field="related"
- fields="name, detail"
-
- widget-name='cs-display-property'
- label-detail=''
- widget-detail='sib-action'
- action-detail='entrepreneur-resource-detail'
- )
+ //- sib-display(
+ //- bind-resources,
+ //- nested-field="related"
+ //- fields="name, detail"
+
+ //- widget-name='cs-display-property'
+ //- label-detail=''
+ //- widget-detail='sib-action'
+ //- action-detail='entrepreneur-resource-detail'
+ //- )
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 5718b733..a535cd47 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -119,18 +119,18 @@
nested-field="conversations"
)
- h2.title_lead_avenir=`${data.RelatedResources}`
+ //- h2.title_lead_avenir=`${data.RelatedResources}`
- sib-display(
- bind-resources,
- nested-field="related"
- fields="name, detail"
-
- widget-name='cs-display-property'
- label-detail=''
- widget-detail='sib-action'
- action-detail='mentor-resource-detail'
- )
+ //- sib-display(
+ //- bind-resources,
+ //- nested-field="related"
+ //- fields="name, detail"
+
+ //- widget-name='cs-display-property'
+ //- label-detail=''
+ //- widget-detail='sib-action'
+ //- action-detail='mentor-resource-detail'
+ //- )
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 2219535c..4eacb369 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -120,16 +120,16 @@
nested-field="conversations"
)
- h2.title_lead_avenir=`${data.RelatedResources}`
+ //- h2.title_lead_avenir=`${data.RelatedResources}`
- sib-display(
- bind-resources,
- nested-field="related"
- fields="name, detail"
-
- widget-name='cs-display-property'
- label-detail=''
- widget-detail='sib-action'
- action-detail='public-resource-detail'
- )
+ //- sib-display(
+ //- bind-resources,
+ //- nested-field="related"
+ //- fields="name, detail"
+
+ //- widget-name='cs-display-property'
+ //- label-detail=''
+ //- widget-detail='sib-action'
+ //- action-detail='public-resource-detail'
+ //- )
--
GitLab
From 008df63b01ed383a595e667842d00309391ec190 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Dec 2019 15:11:06 +0100
Subject: [PATCH 6/7] change share label
---
src/includes/entrepreneur/resources/detail.pug | 2 +-
src/includes/mentor/resources/detail.pug | 2 +-
src/includes/public/resources/detail.pug | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index faf54deb..71ba9a01 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -94,7 +94,7 @@
//- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
//- )
- p SHARE
+ p SHARE :
sib-display.email-link(
bind-resources
fields="@id"
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index a535cd47..7746e26f 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -94,7 +94,7 @@
//- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
//- )
- p SHARE
+ p SHARE :
sib-display.email-link(
bind-resources
fields="@id"
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 4eacb369..3ed71dbc 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -94,7 +94,7 @@
//- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
//- )
- p SHARE
+ p SHARE :
sib-display.email-link(
bind-resources
--
GitLab
From 005c6f2ea8f5d3ec5f2d6825f61c5612d8c500ca Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Dec 2019 15:40:10 +0100
Subject: [PATCH 7/7] fix on label.
---
src/includes/entrepreneur/profile/detail.pug | 2 +-
src/includes/mentor/profile/detail.pug | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/includes/entrepreneur/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug
index 3d5d8315..62957bf8 100644
--- a/src/includes/entrepreneur/profile/detail.pug
+++ b/src/includes/entrepreneur/profile/detail.pug
@@ -33,7 +33,7 @@ div.block_list.flex
sib-display#entrepreneur_contact(
bind-user
fields='email'
- label-email=`${data.Email}`
+ label-email=`${data.Email} : `
class-email="contact_profil"
widget-email='cs-display-resource-property'
)
\ No newline at end of file
diff --git a/src/includes/mentor/profile/detail.pug b/src/includes/mentor/profile/detail.pug
index 519e4356..5af1c16e 100644
--- a/src/includes/mentor/profile/detail.pug
+++ b/src/includes/mentor/profile/detail.pug
@@ -57,9 +57,9 @@ div.block_list.flex
sib-display#mentor_contact(
bind-user
fields='email, mentorProfile.phone, mentorProfile.linkedin, mentorProfile.twitter'
- label-email=`${data.Email}`
+ label-email=`${data.Email} : `
class-email="contact_profil"
- label-mentorProfile.phone=`${data.PhoneNumber}`
+ label-mentorProfile.phone=`${data.PhoneNumber} : `
class-mentorProfile.phone="contact_profil"
widget-email='cs-display-resource-property'
widget-mentorProfile.phone='cs-display-resource-property'
--
GitLab