diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index ce0cb42cab5e95efc21fe711136035d21d78934a..a76b9c9717ee9fbdc7fe9a7ee63e1cca662c7077 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -12,7 +12,7 @@ h2.title_create Complete your entrepreneur account
sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
bind-user
- fields="last_name, first_name, entrepreneur_profile.organisation, username"
+ fields="last_name, first_name, entrepreneur_profile.organisation, account.picture, username"
range-entrepreneur_profile.organisation=`${endpoints.organisations}`
@@ -25,6 +25,10 @@ sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
widget-entrepreneur_profile.organisation='sib-form-auto-completion'
widget-username='sib-form-hidden'
+
+ upload-url-account.picture=`${sdn}upload/`
+ widget-account.picture='sib-form-file'
+ class-account.picture='input_photo w_25'
submit-button="COMPLETE YOUR ACCOUNT"
next="entrepreneur-dashboard"
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index fc5da4bc0021d19f2d1d8a97ac4b200708c55d57..a783c83260e8f158e2cf99c71dc6e3640fc257b0 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -4,7 +4,7 @@ h2.title_create Edit your account
sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
bind-user
- fields="info(last_name, first_name, username, email, entrepreneur_profile.organisation)"
+ fields="info(last_name, first_name, username, email, entrepreneur_profile.organisation, account.picture)"
range-entrepreneur_profile.organisation=`${endpoints.organisations}`
label-first_name="Surname"
@@ -23,6 +23,10 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
multiple-entrepreneur_profile.organisation='sib-multiple-select'
widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+ upload-url-account.picture=`${sdn}upload/`
+ widget-account.picture='sib-form-file'
+ class-account.picture='input_photo w_25'
+
submit-button="Save modifications"
next='entrepreneur-resource-list'
)
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index fc8f613b000d2de63fb05220e354fb2916fdc137..89ed339e2dc34f09ccef2499aa86e20585e713ce 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -21,7 +21,6 @@ section#home
dialog#mentor-resource-detail.no-sidebar
include resources/detail.pug
- sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
dialog#mentor-resource-validate.no-sidebar.container
include resources/validate.pug
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index 17f7c8f75f9c65492c761857cf429925ed7b42b0..d1bf6235698182dbffd04a069e3e9cd9f0190ef2 100644
--- a/src/includes/mentor/profile/create.pug
+++ b/src/includes/mentor/profile/create.pug
@@ -60,7 +60,7 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
multiple-mentor_profile.fields='sib-multiple-select'
widget-mentor_profile.fields='sib-form-auto-completion'
- upload-url-account.picture=`${sdn}/upload/`
+ upload-url-account.picture=`${sdn}upload/`
widget-account.picture='sib-form-file'
class-account.picture='input_photo w_25'
class-headline='w_75'
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index 1cdcc94f189ee19f68b087c647354c29d67480ca..018315e5ac01375232b7d6ae716ece615ef4d502 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -52,13 +52,18 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
multiple-mentor_profile.fields='sib-multiple-select'
widget-mentor_profile.fields='sib-form-auto-completion'
- upload-url-account.picture=`${sdn}/upload/`
+ upload-url-account.picture=`${sdn}upload/`
widget-account.picture='sib-form-file'
class-account.picture='input_photo w_25'
class-headline='w_75'
submit-button="Save modifications"
+<<<<<<< HEAD
next='mentor-dashboard'
)
-sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
\ No newline at end of file
+sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
+=======
+ next='mentor-resource-list'
+)
+>>>>>>> 9192f2b5e98a215b5211905e68417f1a06b2baf6
diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug
index 7ba9d9b1219fe2de81020f2ab2a37b7e3620a757..98488b194084c93325ce403a3a86be2cbf0c7599 100644
--- a/src/includes/mentor/resources/create.pug
+++ b/src/includes/mentor/resources/create.pug
@@ -76,6 +76,10 @@ p.p_entete Thank you for enriching our database !
widget-skills='sib-form-textarea'
widget-publication_year='sib-form-number'
+ upload-url-preview_image=`${sdn}upload/`
+ widget-preview_image='sib-form-file'
+ class-preview_image='input_photo w_25'
+
submit-button='Send for validation ->'
next="resource-creation-confirmation"
)
\ No newline at end of file
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 427645b0745e0611f93b8ebb5bcdc810d9bfbce7..03b72aa6a42ea6d03e57675dac557b93076557f6 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -1,20 +1,24 @@
include ../../components/widgets
.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="mentor-resource-list")
+ .like
+ p.backlink
+ i.fas.fa-times
+
sib-display(
bind-resources,
fields='name, steps, format, content(preview_image, tags),\
submitter_info(submitter.account.picture, submitter.name, \
submitter.mentor_profile.organisation.name, skills, uri, broken),\
- description, review.status, review.reviewer.account.picture, review.reviewer.name, copyright, specifications(\
+ description, review.reviewer.account.picture, review.reviewer.name,\
+ copyright, specifications(\
header_specifications, author, country, language.name,\
- publication_year, fields, sharing), \
- edit',
+ publication_year, fields, sharing)',
widget-submitter.name='cs-display-resource-property',
class-name="title_form"
class-steps="steps"
- widget-edit='sib-action',
widget-author='cs-display-resource-property',
widget-country='cs-display-resource-property',
widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
@@ -31,7 +35,7 @@ include ../../components/widgets
widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
- widget-review.status='cs-resource-status'
+ widget-preview_image='cs-profile-picture'
widget-review.reviewer.account.picture='cs-account-picture'
widget-review.reviewer.name='cs-resource-reviewer'
class-review.reviewer.name="validator_ressource"
@@ -60,12 +64,9 @@ include ../../components/widgets
label-uri='Link to resource'
name-uri='original-link'
label-country='Country:'
- label-submitter.mentor_profile.organisation.name='Organisation:',
- label-author='Author :',
- label-submitter.name='Resource posted by:',
- label-edit='Edit',
- label-review=''
- action-edit='mentor-resource-edit',
+ label-submitter.mentor_profile.organisation.name='Organisation:'
+ label-author='Author :'
+ label-submitter.name='Resource posted by:'
action-broken='resource-report-broken-link'
)
@@ -74,9 +75,7 @@ include ../../components/widgets
<p class="backlink"><i class='far fa-thumbs-up'></i>18</p>
<p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
</div>
- <div class="like">
- <p class="backlink"><i class="fas fa-times"></i></p>
- </div>
+
sib-display(
bind-resources
fields=""
@@ -103,6 +102,8 @@ include ../../components/widgets
id-suffix="conversations"
)
+ h2.title_lead_avenir Related resources
+
sib-display(
bind-resources,
nested-field="related"
diff --git a/src/includes/mentor/resources/edit.pug b/src/includes/mentor/resources/edit.pug
index 3243643d7f5c3a4fad2b0e1a7ab4e85adeb47005..66dc47a260a3e80336f0216fe750faaf95e785e7 100644
--- a/src/includes/mentor/resources/edit.pug
+++ b/src/includes/mentor/resources/edit.pug
@@ -76,6 +76,10 @@ p.p_entete Thank you for enriching our database !
widget-skills='sib-form-textarea'
widget-publication_year='sib-form-number'
+ upload-url-preview_image=`${sdn}upload/`
+ widget-preview_image='sib-form-file'
+ class-preview_image='input_photo w_25'
+
submit-button='Send for validation ->'
next="resource-creation-confirmation"
)
\ No newline at end of file