diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index ea55eab02bd191b0c48251b0bf9440e58b68099a..c14c33f221127d8b3cc908c2566aadd4ae47a621 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -81,7 +81,7 @@ sib-widget(name='cs-validate-action')
sib-widget(name='cs-detail-action')
template
div
- sib-link(
+ sib-link.detailLink(
data-src="\${src}"
next="\${value}"
) <i class="fas fa-eye"></i>
@@ -109,6 +109,14 @@ sib-widget(name='cs-broken-action')
data-src="\${src}"
next="\${value}"
) <i class="fas fa-heart-broken"></i> ${label}
+
+sib-widget(name='cs-request-status-action')
+ template
+ div
+ sib-link.button_base.pull-right(
+ data-src="\${src}"
+ next="confirm_status_change"
+ ) ${label}
sib-widget(name='cs-section_introduction')
template
@@ -150,3 +158,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/components/header.pug b/src/includes/entrepreneur/components/header.pug
index ab9b1d5aca7a5314be7c86572ea74fb9df2d141c..2e707496280b4a80755342de18352d81684237b2 100644
--- a/src/includes/entrepreneur/components/header.pug
+++ b/src/includes/entrepreneur/components/header.pug
@@ -7,16 +7,16 @@
include menu.pug
div.flex.flex_espace.flex_item_center
- sib-form(
- data-src=`${endpoints.languages}`
- fields='languages'
- range-languages=`${endpoints.languages}`
- widget-languages='sib-form-dropdown'
- selected-languages=`${endpoints.languages}/1/`
- label-languages=''
- naked
- )
- input.ico_droite.ico_search
+ //- sib-form(
+ //- data-src=`${endpoints.languages}`
+ //- fields='languages'
+ //- range-languages=`${endpoints.languages}`
+ //- widget-languages='sib-form-dropdown'
+ //- selected-languages=`${endpoints.languages}/1/`
+ //- label-languages=''
+ //- naked
+ //- )
+ //- input.ico_droite.ico_search
.dropdownWrapper
sib-display#user-account-picture.dropdownLabel(
diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index a76b9c9717ee9fbdc7fe9a7ee63e1cca662c7077..ccfda50e280d3eefc8f4e76528d13d55e200fb4a 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -21,13 +21,12 @@ sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
label-entrepreneur_profile.organisation="Organisation *"
class-entrepreneur_profile.organisation='form-label is-dark'
- multiple-entrepreneur_profile.organisation='sib-multiple-select'
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'
+ 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 a437cc5daa71078dc4b0e8ef004e805c58b54814..c18664c6a31bfcaffca86172e96f09e304d55eb7 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -20,11 +20,10 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
class-entrepreneur_profile.phone='form-label is-dark input_big'
class-entrepreneur_profile.organisation='form-label is-dark input_big'
- 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'
+ 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 21094a60b3f4d15903ba242a52f2c2040f2f8ac5..4fa44af4bc54d2051f0891a000729148b237916a 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -7,29 +7,29 @@ include ../../components/widgets
i.fas.fa-times
div#detail-entrepreneur-loader
- hidden Loading the resources, please wait...
-
- sib-display(
+ hidden
+ i.fas.fa-spinner.fa-spin
+ sib-display#detail-entrepreneur(
loader-id="detail-entrepreneur-loader"
bind-resources,
- fields='name, steps, format, \
+ fields='name, steps, format.name, \
submitter_info(submitter.account.picture, submitter.name, \
submitter.mentor_profile.organisation.name, skills, uri, broken),\
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"
- widget-format='cs-display-multiple-property'
+ widget-format.name='cs-display-resource-property'
widget-uri='cs-display-link'
class-uri="pull-left"
widget-skills='cs-display-resource-property'
@@ -51,9 +51,8 @@ include ../../components/widgets
label-language.name='Language:'
label-publication_year='Year of publication:'
label-header_specifications='Resource specifications'
- each-label-format=''
- label-format=''
- multiple-format
+ class-format.name='format_type'
+ label-format.name=''
widget-steps='cs-display-step-property'
label-steps=''
@@ -68,18 +67,18 @@ 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:'
- action-broken='resource-report-broken-link'
+ action-broken='resource-report-broken-link-entrepreneur'
)
//- Add likes here
- <div class="like">
- <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='far fa-thumbs-up'></i>18</p>
+ //- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
+ //- </div>
sib-display(
bind-resources
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index e65292ab29768b5d4150f06161161685e29f917c..8d32b57fd16d0bebd2fefe7189a58438a79a2f9c 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -1,5 +1,10 @@
include ../../components/widgets
+sib-router
+ sib-route( name='resource-report-broken-link-entrepreneur', use-id)
+
+dialog#resource-report-broken-link-entrepreneur
+ include ./resource-report-broken-link-entrepreneur
div.container_min
h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
@@ -21,14 +26,9 @@ container.block_list
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-loader"
- fields='keyword(name_keyword, description, author)'
- label-keyword="Search by author, name..."
- widget-keyword="sib-form-placeholder-text"
-
- widget-description='cs-display-property'
- widget-name_keyword='cs-display-property'
- widget-author='cs-display-property'
-
+ fields='keyword(name_keyword)'
+ label-name_keyword="Search by name..."
+ widget-name_keyword="sib-form-placeholder-text"
naked
)
@@ -43,32 +43,37 @@ container.block_list
naked
)
- sib-form.more_criterias.flex.flex_espace(
- data-src=`${endpoints.resources}`,
- fields='header_criterias, format, publication_year, country, language, fields'
- label-header_criterias='More criterias'
- label-format='Format:'
- label-publication_year='Year of publication'
- label-country='Country of publication'
- label-language='Language'
- label-fields='Field'
- widget-header_criterias='cs-section_header'
-
- range-language=`${endpoints.languages}`
- range-fields=`${endpoints.fields}`
- range-format=`${endpoints.formats}`
-
- multiple-language='sib-form-dropdown'
- widget-language='sib-form-auto-completion'
-
- multiple-format='sib-form-dropdown'
- widget-format='sib-form-auto-completion'
- multiple-fields='sib-form-dropdown'
- widget-fields='sib-form-auto-completion'
-
- naked
- )
+ sib-form.more_criterias.flex.flex_espace(
+ data-src=`${endpoints.resources}`,
+ fields='header_criterias, format, publication_year, country, language, fields'
+ label-header_criterias='More criterias'
+ label-format='Format:'
+ label-publication_year='Year of publication'
+ label-country='Country of publication'
+ label-language='Language'
+ label-fields='Field'
+ widget-header_criterias='cs-section_header'
+
+ 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'
+
+ multiple-format='sib-form-dropdown'
+ widget-format='sib-form-auto-completion'
+
+ multiple-fields='sib-form-dropdown'
+ widget-fields='sib-form-auto-completion'
+
+ naked
+ )
div.w_25
div.block_aside_entre
@@ -79,7 +84,7 @@ container.block_list
div
div.button_base Make a request
-
+
//Fake tabs to filter by type.
div.tabs.flex_espace
div(class='tablink filter_by_type active', onclick="openFakeTab(this)")
@@ -97,38 +102,36 @@ container.block_list
)
div.block_log.block_list
-
+
//Step 1
div.step
- div#step1-loader
- hidden Loading the resources, please wait...
-
+ div#resources-loader-step1
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
- loader-id="resources-loader"
+ loader-id="resources-loader-step1"
data-src=`${endpoints.steps}1/`,
fields='name'
class="accordion active"
-
+
label-name ='Step 1 '
label-resources=''
-
+
widget-name='cs-steps-header'
)
-
+
sib-display.resource_by_step(
- loader-id="step1-loader"
- data-src=`${endpoints.steps}1/resources/`,
- fields='name, format, publication_year, description, like, dislike',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}1/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -137,55 +140,54 @@ container.block_list
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
-
+
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
+ widget-format.name='cs-display-resource-property'
widget-like='fake-like'
widget-dislike='fake-dislike'
- label-format=''
- multiple-format
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
class="panel"
+
next='entrepreneur-resource-detail'
paginate-by="5"
)
-
+
//Step 2
div.step
sib-display#circles-list(
data-src=`${endpoints.steps}2/`,
fields='name'
class="accordion"
-
+
label-name ='Step 2 '
label-resources=''
-
+
widget-name='cs-steps-header'
)
-
+
sib-display.resource_by_step(
- data-src=`${endpoints.steps}2/resources/`,
- fields='name, format, publication_year, description, like, dislike',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}2/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -194,20 +196,19 @@ container.block_list
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
-
+
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
+ widget-format.name='cs-display-resource-property'
widget-like='fake-like'
widget-dislike='fake-dislike'
- label-format=''
- multiple-format
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
@@ -218,32 +219,29 @@ container.block_list
paginate-by="5"
)
- //Step 3
div.step
sib-display#circles-list(
data-src=`${endpoints.steps}3/`,
fields='name'
class="accordion"
-
+
label-name ='Step 3 '
label-resources=''
-
- widget-name='cs-steps-header'
-
+
+ widget-name='cs-steps-header'
)
-
+
sib-display.resource_by_step(
- data-src=`${endpoints.steps}3/resources/`,
- fields='name, format, publication_year, description, like, dislike',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}3/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -252,19 +250,18 @@ container.block_list
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
+ widget-format.name='cs-display-resource-property'
widget-like='fake-like'
widget-dislike='fake-dislike'
- label-format=''
- multiple-format
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
@@ -281,26 +278,25 @@ container.block_list
data-src=`${endpoints.steps}4/`,
fields='name'
class="accordion"
-
+
label-name ='Step 4 '
label-resources=''
-
+
widget-name='cs-steps-header'
-
+
)
-
+
sib-display.resource_by_step(
- data-src=`${endpoints.steps}4/resources/`,
- fields='name, format, publication_year, description, like, dislike',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}4/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -309,20 +305,19 @@ container.block_list
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
-
+
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
+ widget-format.name='cs-display-resource-property'
widget-like='fake-like'
widget-dislike='fake-dislike'
- label-format=''
- multiple-format
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
@@ -339,25 +334,24 @@ container.block_list
data-src=`${endpoints.steps}5/`,
fields='name'
class="accordion"
-
+
label-name ='Step 5 '
label-resources=''
-
+
widget-name='cs-steps-header'
)
-
+
sib-display.resource_by_step(
- data-src=`${endpoints.steps}5/resources/`,
- fields='name, format, publication_year, description, like, dislike',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}5/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -366,20 +360,74 @@ container.block_list
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
+
+
+ widget-name='cs-display-property'
+ widget-country='hidden-widget'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+ class="panel"
+ next='entrepreneur-resource-detail'
+ paginate-by="5"
+ )
+ //Step 6
+ div.step
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}6/`,
+ fields='name'
+ class="accordion"
+
+ label-name ='Step 6 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}6/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
+ widget-format.name='cs-display-resource-property'
widget-like='fake-like'
widget-dislike='fake-dislike'
- label-format=''
- multiple-format
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
@@ -389,4 +437,4 @@ container.block_list
paginate-by="5"
)
-
+
diff --git a/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug b/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug
new file mode 100644
index 0000000000000000000000000000000000000000..288969241d28984e473810088d5b86c58f5585bb
--- /dev/null
+++ b/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug
@@ -0,0 +1,16 @@
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="entrepreneur-resource-list")
+ .like
+ p
+ i.fas.fa-times
+
+ h2.title_lead_avenir Thanks!
+ p The submitter of the resource will be advised that this link is broken.
+ sib-form#report-broken-link-entrepreneur(
+ data-src=`${endpoints.brokenlinks}`
+ fields = "resource, submitter"
+ widget-resource='sib-form-hidden'
+ widget-submitter='sib-form-hidden'
+ submit-button='ok'
+ next="entrepreneur-resource-list"
+ )
\ No newline at end of file
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 3f431dc843b07ff34c35a4fc07cd5a097858ec02..907cc5fc4ad7e7f01b96f182cc4888633a610f1e 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,7 +2,7 @@ head
title CoopStarter
meta(charset="utf-8")
script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
- script(type="module" src="https://unpkg.com/@startinblox/core")
+ script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
script(type="module" src="https://unpkg.com/@startinblox/router")
script(type="module" src="https://unpkg.com/@startinblox/oidc")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index 7b8062d780fc8c0a6efc6ebb4e5784fd5398ac25..e2f32bf9e94a521b70fd7007a8040e05206f8ada 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -21,20 +21,16 @@ container.block_list.flex.flex_espace
div.w_75.block-g-entre
div
h2.title_form Search for a resource
-
- div#resources-public-loader
- hidden Loading resources, please wait...
-
+ div#resources-mentor-database-loader
+ hidden
+ i.fas.fa-spinner.fa-spin
+
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
- loader-id="resources-public-loader"
- fields='keyword(name_keyword, description, author)'
- label-keyword="Search by author, name..."
- widget-keyword="sib-form-placeholder-text"
-
- widget-description='cs-display-property'
- widget-name_keyword='cs-display-property'
- widget-author='cs-display-property'
+ loader-id="resources-mentor-database-loader"
+ fields='keyword(name_keyword)'
+ label-name_keyword="Search by name..."
+ widget-name_keyword="sib-form-placeholder-text"
naked
)
@@ -64,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'
@@ -82,14 +82,14 @@ container.block_list.flex.flex_espace
div.tabs.flex_espace
div(class='tablink filter_by_type active', onclick="openFakeTab(this)")
sib-display#type1(
- data-src="https://api.coopstarter.happy-dev.fr/types/1/"
+ data-src=`${endpoints.types}1/`
fields='name'
widget-name='fake-tabs'
)
div(class='tablink filter_by_type', onclick="openFakeTab(this)")
sib-display#type2(
- data-src="https://api.coopstarter.happy-dev.fr/types/2/"
+ data-src=`${endpoints.types}2/`
fields='name'
widget-name='fake-tabs'
)
@@ -98,11 +98,14 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-browse-database
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
- loader-id="resources-loader"
+ loader-id="resources-loader-step1-browse-database"
data-src=`${endpoints.steps}1/`,
fields='name'
- class="accordion"
+ class="accordion active"
label-name ='Step 1 '
label-resources=''
@@ -111,9 +114,9 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}1/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}1/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
@@ -129,22 +132,24 @@ container.block_list.flex.flex_espace
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
paginate-by="5"
)
@@ -163,17 +168,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}2/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}2/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -182,22 +186,24 @@ container.block_list.flex.flex_espace
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
paginate-by="5"
)
@@ -217,17 +223,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}3/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}3/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -236,21 +241,24 @@ container.block_list.flex.flex_espace
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
paginate-by="5"
)
@@ -270,17 +278,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}4/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}4/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -289,22 +296,24 @@ container.block_list.flex.flex_espace
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
paginate-by="5"
)
@@ -323,17 +332,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}5/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}5/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -342,23 +350,80 @@ container.block_list.flex.flex_espace
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
-
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
paginate-by="5"
)
+ //Step 6
+ div.step
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}6/`,
+ fields='name'
+ class="accordion"
+
+ label-name ='Step 6 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}6/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+
+ widget-name='cs-display-property'
+ widget-country='hidden-widget'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+ class="panel"
+ next='entrepreneur-resource-detail'
+
+ paginate-by="5"
+ )
+
diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 758052bb07ffaf28869d4d2f6a757101366ff5d3..0f09c6476c9c75384edd320c7ebb8b509e9308be 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -7,16 +7,16 @@
include menu.pug
div.flex.flex_espace.flex_item_center
- sib-form(
- data-src=`${endpoints.languages}`
- fields='languages'
- range-languages=`${endpoints.languages}`
- widget-languages='sib-form-dropdown'
- selected-languages=`${endpoints.languages}/1/`
- label-languages=''
- naked
- )
- input.ico_droite.ico_search
+ //- sib-form(
+ //- data-src=`${endpoints.languages}`
+ //- fields='languages'
+ //- range-languages=`${endpoints.languages}`
+ //- widget-languages='sib-form-dropdown'
+ //- selected-languages=`${endpoints.languages}/1/`
+ //- label-languages=''
+ //- naked
+ //- )
+ //- input.ico_droite.ico_search
.dropdownWrapper
sib-display#user-account-picture.dropdownLabel(
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index 252cb167b2a63d5bc4afcf5bb552ba44478c02f5..d34b539a2c3249111eaabe34a9267a0d444f75a5 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -23,9 +23,8 @@ section#home
dialog#mentor-resource-detail.no-sidebar
include resources/detail.pug
- dialog#mentor-resource-validate.no-sidebar.container
- include resources/validate.pug
- sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
+ dialog#mentor-resource-validate.no-sidebar
+ include resources/validate.pug
dialog#resource-validation-process.no-sidebar
include ./validation-process.pug
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index d1bf6235698182dbffd04a069e3e9cd9f0190ef2..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"
@@ -49,8 +50,8 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
widget-username="sib-form-hidden"
class-mentor_profile.organisation='form-label is-dark'
- multiple-mentor_profile.organisation='sib-multiple-select'
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'
@@ -61,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 3d2d162664307fb1ff39917dcc06f876d479146f..198a850a3b35ce05fb54806682eb33c30e7e4f1a 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -7,7 +7,7 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
fields="account_information(last_name, first_name, mentor_profile.organisation,\
mentor_profile.phone, mentor_profile.languages, mentor_profile.fields),\
about_you(header_about_you, account.picture, mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
- mentor_profile.biography, mentor_profile.skills),\
+ mentor_profile.biography, mentor_profile.skills, resources),\
social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter), username"
range-mentor_profile.fields=`${endpoints.fields}`
@@ -39,9 +39,9 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
widget-mentor_profile.skills="sib-form-textarea"
widget-mentor_profile.biography="sib-form-textarea"
widget-username="sib-form-hidden"
+ widget-resources="hidden-widget"
class-mentor_profile.organisation='form-label is-dark'
- multiple-mentor_profile.organisation='sib-multiple-select'
widget-mentor_profile.organisation='sib-form-auto-completion'
class-mentor_profile.languages='form-label is-dark'
@@ -53,7 +53,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/confirmation-status-change.pug b/src/includes/mentor/resources/confirmation-status-change.pug
new file mode 100644
index 0000000000000000000000000000000000000000..b4c9ebf06122c05352820691b5e69dd620cdb683
--- /dev/null
+++ b/src/includes/mentor/resources/confirmation-status-change.pug
@@ -0,0 +1,18 @@
+include ../../components/widgets
+
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="mentor-resource-list")
+ .like
+ p
+ i.fas.fa-times
+
+ h2.title_lead_avenir Are you sur you want to archive this request ?
+
+ sib-form#change_status_request(
+ bind-resources
+ fields='button(status, name, description, skills, reviewer)'
+ value-status = "validated"
+ widget-button = "hidden-widget"
+ submit-button = "Archive this request"
+ next="mentor-resource-list"
+ )
diff --git a/src/includes/mentor/resources/confirmation.pug b/src/includes/mentor/resources/confirmation.pug
index 766dc355773eea7e1c79efd64ccbb1da04cda23f..5c2c310e8acdd87fc0f5ec8db87c9cc4be9d4d9e 100644
--- a/src/includes/mentor/resources/confirmation.pug
+++ b/src/includes/mentor/resources/confirmation.pug
@@ -1,6 +1,12 @@
div.container_min
h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
+sib-router
+ sib-route(name='resource-validation-process-confirmation')
+
+dialog#resource-validation-process-confirmation.no-sidebar
+ include ../validation-process.pug
+
div.block_list
h2.title_lead_avenir Post a resource
@@ -10,14 +16,7 @@ div.block_list
div
p.flex
-
- sib-router
- sib-route(name='resource-validation-process_confirmation')
-
- dialog#resource-validation-process_confirmation
- include ../validation-process.pug
-
- sib-link(class="backlink pull-right", next="resource-validation-process_confirmation") What is a validation process ?
+ sib-link(class="backlink pull-right", next="resource-validation-process-confirmation") What is a validation process ?
div.flex
h3.button_base
diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug
index bc9083862429f6cb1788c5fd9ce5c17dc4f691af..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'
@@ -60,7 +61,6 @@ p.p_entete Thank you for enriching our database !
multiple-type='sib-multiple-select'
widget-type='sib-form-auto-completion'
- multiple-format='sib-multiple-select'
widget-format='sib-form-auto-completion'
multiple-steps='sib-multiple-select'
@@ -75,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/detail.pug b/src/includes/mentor/resources/detail.pug
index 8d546ed927c01f23043f3cba1f9ff5ddd764c733..cf20f6a78515dd973cbcb056b19221595ccf3042 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -7,12 +7,12 @@ include ../../components/widgets
i.fas.fa-times
div#detail-mentor-loader
- hidden Loading the resources, please wait...
+ hidden Loading the resource, please wait...
- sib-display(
+ sib-display#detail-mentor(
loader-id="detail-mentor-loader"
bind-resources,
- fields='name, steps, format,\
+ fields='name, steps, format.name,\
submitter_info(submitter.account.picture, submitter.name, \
submitter.mentor_profile.organisation.name, skills, uri, broken),\
content(preview_image, tags),\
@@ -29,8 +29,8 @@ include ../../components/widgets
widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
- widget-format='cs-display-multiple-property'
- class-format='format_type'
+ widget-format.name='cs-display-resource-property'
+ class-format.name='format_type'
widget-uri='cs-display-link'
class-uri="pull-left"
widget-skills='cs-display-resource-property'
@@ -52,10 +52,8 @@ include ../../components/widgets
label-language.name='Language:'
label-publication_year='Year of publication:'
label-header_specifications='Resource specifications'
- each-label-format=''
- label-format=''
- multiple-format
-
+ label-format.name=''
+
widget-steps='cs-display-step-property'
label-steps=''
each-label-steps="Step"
@@ -73,14 +71,14 @@ include ../../components/widgets
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
- action-broken='resource-report-broken-link'
+ action-broken='resource-report-broken-link-mentor'
)
- //- Add likes here
- <div class="like">
- <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>
+ //TODO: implement likes here
+ //- <div class="like">
+ //- <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>
sib-display(
bind-resources
diff --git a/src/includes/mentor/resources/edit.pug b/src/includes/mentor/resources/edit.pug
index 66dc47a260a3e80336f0216fe750faaf95e785e7..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,13 +55,14 @@ 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'
multiple-type='sib-multiple-select'
widget-type='sib-form-auto-completion'
- multiple-format='sib-multiple-select'
widget-format='sib-form-auto-completion'
multiple-steps='sib-multiple-select'
@@ -77,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 254e0518ff2eed7c7cb35811f48a121e8d46b585..75c19e5897329875fb2089ff2eb8288db5653dc6 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -2,10 +2,18 @@ include ../../components/widgets
sib-router
sib-route( name='confirm_suppress', use-id)
+ sib-route( name='resource-report-broken-link-mentor', use-id)
+ sib-route( name='confirm_status_change', id-prefix=`${endpoints.requests}`, use-id)
dialog#confirm_suppress.no-sidebar
include ./confirmation-deletion
+dialog#resource-report-broken-link-mentor
+ include ./resource-report-broken-link-mentor
+
+dialog#confirm_status_change.no-sidebar
+ include ./confirmation-status-change
+
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
@@ -58,24 +66,29 @@ div.block_list
div#loader-requests-mentor
hidden
i.fas.fa-spinner.fa-spin
- sib-display.request_accordion(
+ sib-display#request-list.request_accordion(
loader-id="loader-requests-mentor"
data-src=`${endpoints.requests}`
- fields='name, content(description, info(fields, language.name, target), create)',
-
+ fields='name, content(description, info(fields, language.name, target, submitter.email, status))',
+ search-fields='status'
label-target='Target audience:'
label-language.name='Language:'
+ label-submitter.email="submitter'email :"
label-fields='Fields:'
each-label-fields=''
multiple-fields
widget-fields='cs-display-multiple-property'
widget-language.name='cs-display-resource-property'
widget-target='cs-display-resource-property'
+ widget-submitter.email='cs-display-resource-property'
widget-name='accordion-request-resource'
+ search-widget-status='hidden-widget'
+ search-value-status='pending'
+
+ label-status='Dealt with'
+ widget-status='cs-request-status-action'
+ action-status="status"
- label-create='Post a resource'
- action-create="mentor-resource-create"
- widget-create='cs-validate-action'
)
@@ -88,13 +101,14 @@ div.block_list
bind-user
nested-field='resources'
- fields='search_for_a_resource(name, description, author),content(name, format, publication_year), actions(review.status, detail, edit, delete)',
+ fields='search_for_a_resource(name, description, author),content(name, format.name, publication_year), actions(review.status, detail, edit, delete)',
search-fields='search_for_a_resource, header_criterias, more_criterias_hidden(format, publication_year, country, language, fields)',
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 author, name..."
+ search-label-search_for_a_resource="Search by name..."
search-widget-search_for_a_resource="sib-form-placeholder-text"
widget-search_for_a_resource="hidden-widget"
@@ -105,6 +119,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"
@@ -118,13 +134,9 @@ div.block_list
class-name="tit_element_list"
-
- widget-format='cs-display-multiple-property'
- label-format='Formats'
- class-format="contenu_list"
-
- each-label-format=''
- multiple-format
+ widget-format.name='cs-display-resource-property'
+ label-format.name='Format:'
+ class-format.name="contenu_list"
class-publication_year="contenu_list"
diff --git a/src/includes/mentor/resources/resource-report-broken-link-mentor.pug b/src/includes/mentor/resources/resource-report-broken-link-mentor.pug
new file mode 100644
index 0000000000000000000000000000000000000000..b2f1207b96403bb312e268d5390adc4bfe4b467a
--- /dev/null
+++ b/src/includes/mentor/resources/resource-report-broken-link-mentor.pug
@@ -0,0 +1,16 @@
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="mentor-resource-list")
+ .like
+ p
+ i.fas.fa-times
+
+ h2.title_lead_avenir Thanks!
+ p The submitter of the resource will be advised that this link is broken.
+ sib-form#report-broken-link-mentor(
+ data-src=`${endpoints.brokenlinks}`
+ fields = "resource, submitter"
+ widget-resource='sib-form-hidden'
+ widget-submitter='sib-form-hidden'
+ submit-button='ok'
+ next="mentor-resource-list"
+ )
\ No newline at end of file
diff --git a/src/includes/mentor/resources/validate.pug b/src/includes/mentor/resources/validate.pug
index fc3853f80b5323c312db84d1ca801bd9f05ca11d..3b1fee99dd110bcbcb942dff8a9918074f87d380 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -5,22 +5,38 @@ sib-router
sib-route(name='refusal-dialog')
sib-route(name='review-submission-confirmation')
-.block_log.block_creat_count
- sib-display#detail-view(
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="mentor-resource-list")
+ .like
+ p.backlink
+ i.fas.fa-times
+
+ div#detail-validation-loader
+ hidden Loading the resource, please wait...
+
+ sib-display(
+ loader-id="detail-validation-loader"
bind-resources,
- fields='name, steps, format, content(preview_image, tags),\
+ fields='name, steps, format.name,\
submitter_info(submitter.account.picture, submitter.name, \
- submitter.mentor_profile.organisation.name, skills, uri),\
+ 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'
- widget-format='cs-display-multiple-property'
+ class-submitter.name="autor_ressource"
+ class-broken="broken"
+ widget-format.name='cs-display-resource-property'
+ class-format.name='format_type'
widget-uri='cs-display-link'
+ class-uri="pull-left"
widget-skills='cs-display-resource-property'
widget-description='cs-display-property'
widget-name='cs-display-property'
@@ -29,6 +45,7 @@ sib-router
widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
+ widget-preview_image='cs-preview-picture'
widget-header_specifications='cs-section_header'
label-broken='Report broken link'
@@ -36,10 +53,8 @@ sib-router
label-language.name='Language:'
label-publication_year='Year of publication:'
label-header_specifications='Resource specifications'
- each-label-format=''
- label-format=''
- multiple-format
-
+ label-format.name=''
+
widget-steps='cs-display-step-property'
label-steps=''
each-label-steps="Step"
@@ -53,10 +68,11 @@ 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-submitter.mentor_profile.organisation.name='Organisation:',
- label-author='Author :',
+ label-country.name='Country:'
+ label-submitter.mentor_profile.organisation.name='Organisation:'
+ label-author='Author :'
label-submitter.name='Resource posted by:'
+ action-broken='resource-report-broken-link-mentor'
)
p.p_entete
diff --git a/src/includes/public/components/header.pug b/src/includes/public/components/header.pug
index 59f5c96199fc111ef199f57c8bdcd1aea63c2883..36a8d5ff4c0ef6ee2a20a80987b697d0ff2f7df3 100644
--- a/src/includes/public/components/header.pug
+++ b/src/includes/public/components/header.pug
@@ -1,19 +1,19 @@
.container
.flex.flex_espace.flex_item_center
- sib-link(next='entrepreneur-resource-list')
+ sib-link(next='public-resource-list')
figure.logo_head.margin_bord_ecran
img(src="../images/logo_head.png" alt="Coopstarter")
include menu.pug
div.flex.flex_espace.flex_item_center
- sib-form(
- data-src=`${endpoints.languages}`
- fields='languages'
- range-languages=`${endpoints.languages}`
- widget-languages='sib-form-dropdown'
- selected-languages=`${endpoints.languages}/1/`
- label-languages=''
- naked
- )
- input.ico_droite.ico_search
+ //- sib-form(
+ //- data-src=`${endpoints.languages}`
+ //- fields='languages'
+ //- range-languages=`${endpoints.languages}`
+ //- widget-languages='sib-form-dropdown'
+ //- selected-languages=`${endpoints.languages}/1/`
+ //- label-languages=''
+ //- naked
+ //- )
+ //- input.ico_droite.ico_search
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index ad77c839696d2ab7b0832be84523515a79293d0e..84d387e03b90f74ca5897bca30bcd5c221b4e81d 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -7,29 +7,30 @@ include ../../components/widgets
i.fas.fa-times
div#detail-public-loader
- hidden Loading resources, please wait...
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display(
loader-id="detail-public-loader"
bind-resources,
- fields='name, steps, format,\
+ fields='name, steps, format.name,\
submitter_info(submitter.account.picture, submitter.name, \
submitter.mentor_profile.organisation.name, skills, uri, broken),\
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"
- widget-format='cs-display-multiple-property'
+ widget-format.name='cs-display-resource-property'
widget-uri='cs-display-link'
class-uri="pull-left"
widget-skills='cs-display-resource-property'
@@ -51,9 +52,8 @@ include ../../components/widgets
label-language.name='Language:'
label-publication_year='Year of publication:'
label-header_specifications='Resource specifications'
- each-label-format=''
- label-format=''
- multiple-format
+ label-format.name=''
+ class-format.name='format_type'
widget-steps='cs-display-step-property'
label-steps=''
@@ -68,18 +68,18 @@ 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:'
- action-broken='resource-report-broken-link'
+ action-broken='resource-report-broken-link-public'
)
//- Add likes here
- <div class="like">
- <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='far fa-thumbs-up'></i>18</p>
+ //- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
+ //- </div>
sib-display(
bind-resources
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index 185ef2224070f411fb00d0e109e0ddefc9d03be8..ba13d1bf44e1cbf505687fad7e1ffdef21b35cdc 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -1,33 +1,28 @@
include ../../components/widgets
+sib-router
+ sib-route( name='resource-report-broken-link-public', use-id)
+
+dialog#resource-report-broken-link-public
+ include ./resource-report-broken-link-public
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
-//-About :
-//It will be great to have autocompletion on country
-//I'm waiting for a confirmation to suppress step field
-
-
container.block_list.flex.flex_espace
div.w_75.block-g-entre
div
h2.title_form Search for a resource
-
- div#resources-public-loader
- hidden Loading resources, please wait...
-
+ div#public-resources-loader
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
- loader-id="resources-public-loader"
- fields='keyword(name_keyword, description, author)'
- label-keyword="Search by author, name..."
- widget-keyword="sib-form-placeholder-text"
-
- widget-description='cs-display-property'
- widget-name_keyword='cs-display-property'
- widget-author='cs-display-property'
+ loader-id="public-resources-loader"
+ fields='keyword(name_keyword)'
+ label-name_keyword="Search by name..."
+ widget-name_keyword="sib-form-placeholder-text"
naked
)
@@ -57,6 +52,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'
@@ -66,6 +62,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
)
@@ -75,14 +74,14 @@ container.block_list.flex.flex_espace
div.tabs.flex_espace
div(class='tablink filter_by_type active', onclick="openFakeTab(this)")
sib-display#type1(
- data-src="https://api.coopstarter.happy-dev.fr/types/1/"
+ data-src=`${endpoints.types}1/`
fields='name'
widget-name='fake-tabs'
)
div(class='tablink filter_by_type', onclick="openFakeTab(this)")
sib-display#type2(
- data-src="https://api.coopstarter.happy-dev.fr/types/2/"
+ data-src=`${endpoints.types}2/`
fields='name'
widget-name='fake-tabs'
)
@@ -91,11 +90,14 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-public
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
- loader-id="resources-loader"
+ loader-id="resources-loader-step1-public"
data-src=`${endpoints.steps}1/`,
fields='name'
- class="accordion"
+ class="accordion active"
label-name ='Step 1 '
label-resources=''
@@ -104,9 +106,9 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}1/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}1/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
@@ -125,19 +127,21 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
next='public-resource-detail'
@@ -158,17 +162,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}2/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}2/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -180,19 +183,21 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
next='public-resource-detail'
@@ -214,17 +219,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}3/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}3/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -233,22 +237,24 @@ container.block_list.flex.flex_espace
search-widget-language='sib-form-auto-completion'
search-multiple-fields='sib-form-dropdown'
search-widget-fields='sib-form-auto-completion'
+
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
-
+ class="panel"
next='public-resource-detail'
paginate-by="5"
@@ -269,17 +275,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}4/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}4/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -291,19 +296,21 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
next='public-resource-detail'
@@ -324,17 +331,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}5/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ data-src=`${endpoints.steps}5/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
- search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -346,22 +352,79 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="hidden-widget"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
label-language=''
multiple-language
label-fields=''
multiple-fields
+ class="panel"
next='public-resource-detail'
paginate-by="5"
)
+ //Step 6
+ div.step
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}6/`,
+ fields='name'
+ class="accordion"
+
+ label-name ='Step 6 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}6/resources/validated/`,
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
+ search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+
+ widget-name='cs-display-property'
+ widget-country='hidden-widget'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="hidden-widget"
+ widget-format.name='cs-display-resource-property'
+ widget-like='fake-like'
+ widget-dislike='fake-dislike'
+ label-format.name=''
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+ class="panel"
+
+ next='public-resource-detail'
+
+ paginate-by="5"
+ )
diff --git a/src/includes/public/resources/resource-report-broken-link-public.pug b/src/includes/public/resources/resource-report-broken-link-public.pug
new file mode 100644
index 0000000000000000000000000000000000000000..b2ffd7531735a96505a40a37a1cdbf31d5b3b02c
--- /dev/null
+++ b/src/includes/public/resources/resource-report-broken-link-public.pug
@@ -0,0 +1,16 @@
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="public-resource-list")
+ .like
+ p
+ i.fas.fa-times
+
+ h2.title_lead_avenir Thanks!
+ p The submitter of the resource will be advised that this link is broken.
+ sib-form#report-broken-link-public(
+ data-src=`${endpoints.brokenlinks}`
+ fields = "resource, submitter"
+ widget-resource='sib-form-hidden'
+ widget-submitter='sib-form-hidden'
+ submit-button='ok'
+ next="public-resource-list"
+ )
\ No newline at end of file
diff --git a/src/index.pug b/src/index.pug
index 97b326b592cdd829cecca836c67c617cc06b0c98..20604cd66059d2a1260247cafb7a3a7d153d64af 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -51,7 +51,9 @@ script(type='module').
let idToken = await sibAuth.getUserIdToken();
if ( !user ) {
- return;
+ window.dispatchEvent(
+ new CustomEvent('requestNavigation', { detail: { route: 'splash' } })
+ );
}
user = await store.get(user);
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index d73b5105cf34e27887177ba0652d5cfb77e87009..2f43bc724231c9e91e2a0a11413422d0d76d7a15 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -1,3 +1,13 @@
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXX FUNCTIONS XXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
+/**
+ * Manage classic tabs.
+ * @param {string} pageName - Id of the tab content
+ * @param {HTMLElement} elmnt - Accordion element
+ */
function openTab(pageName, elmnt) {
// Hide all elements with class="tabcontent" by default */
var i, tabcontent, tablinks;
@@ -14,7 +24,10 @@ function openTab(pageName, elmnt) {
elmnt.classList.add("active");
}
-//Manage the visual of the fake tabs in entrepreneur dashboard.
+/**
+ * Manage the visual of the fake tabs in entrepreneur dashboard.
+ * @param {HTMLElement} elmnt - Active fake tab.
+ */
function openFakeTab(elmnt) {
// Hide all elements with class="tabcontent" by default */
var i, tablinks;
@@ -23,9 +36,40 @@ function openFakeTab(elmnt) {
for (i = 0; i < tablinks.length; i++) {
tablinks[i].classList.remove("active");
}
+
+ // Show the specific tab content
elmnt.classList.add("active");
}
+/**
+ * Set a preview image on load.
+ * @param {event} event - On file loading.
+ */
+function loadFile(event) {
+ //Création of the preview
+ var elt = document.createElement("img");
+ elt.src = URL.createObjectURL(event.target.files[0]);
+
+ //Remove the default useless image.
+ var labeltag = event.target.closest("label");
+ labeltag.querySelector("input[name='preview_image']").style.display = "none";
+
+ //If there is already a image previewed, remove it.
+ if (labeltag.querySelector("img")) {
+ var oldImage = labeltag.querySelector("img");
+ labeltag.removeChild(oldImage);
+ }
+
+ //Add the previewimage
+ labeltag.insertAdjacentElement("afterbegin", elt);
+}
+
+/**
+ * Fill datas to a form.
+ * @param {HTMLElment} detail - Element with the datas to retrieve.
+ * @param {string} targetFormName - Id of the form to fill.
+ * @param {string} inputName - Name of the input to fill.
+ */
function linkDatasetToField(detail, targetFormName, inputName) {
let targetForm = document.getElementById(targetFormName);
targetForm.addEventListener("populate", event => {
@@ -40,7 +84,11 @@ function linkDatasetToField(detail, targetFormName, inputName) {
});
}
-//Refresh information after a form submission
+/**
+ * Refresh information after a form submission
+ * @param {String} formId - Id of the sumitted form
+ * @param {String} listId - Id of the list to refresh
+ */
function refreshList(formId, listId) {
let form = document.getElementById(formId);
form.addEventListener("save", event => {
@@ -49,7 +97,9 @@ function refreshList(formId, listId) {
});
}
-//Remove pagination when there is no resource in a step group
+/**
+ * Remove pagination when there is no resource in a step group.
+ */
function refreshPagination() {
var resources_containers = document.querySelectorAll(
".resource_by_step sib-form+div"
@@ -63,13 +113,22 @@ function refreshPagination() {
.textContent == 1)
) {
resources_container.nextSibling.setAttribute("style", "display:none");
- } else if (resources_container.nextSibling) {
- resources_container.nextSibling.setAttribute("style", "display:block");
+ } else if (
+ resources_container.nextSibling &&
+ resources_container
+ .closest(".step")
+ .querySelector(".accordion:not(.active)")
+ ) {
+ resources_container.nextSibling.setAttribute("hidden", "hidden");
}
}
}
-//Manage select hidden to fullfill them with more "more criterias" selection
+/**
+ * Manage select hidden to fullfill them with more "more criterias" selection
+ * @param {HTMLElement} select_hidden - Hidden select to fullfill.
+ * @param {HTMLElement} option_selected - Option selcted to set in hidden select.
+ */
function selectHiddenManagement(select_hidden, option_selected) {
options_hidden = select_hidden.getElementsByTagName("option");
for (let option_hidden of options_hidden) {
@@ -89,7 +148,11 @@ function selectHiddenManagement(select_hidden, option_selected) {
refreshPagination();
}
-//Manage input hidden field to fullfill them with more "more criterias" selection
+/**
+ * Manage input hidden field to fullfill them with more "more criterias" selection
+ * @param {HTMLElement} field - Hidden field to fullfill.
+ * @param {HTMLElement} field_search - Field with the value wanted by the user.
+ */
function inputHiddenManagement(field, field_search) {
field.setAttribute("value", field_search.value);
let parent_form = field.closest("sib-form");
@@ -97,11 +160,16 @@ function inputHiddenManagement(field, field_search) {
refreshPagination();
}
-//Manage select hidden for type to fullfill them with more "more criterias" selection
+/**
+ * Manage select hidden for type to fullfill them with more "more criterias" selection
+ * @param {HTMLElement} tab - Selected type tabs.
+ * @param {HTMLElement} form - Hidden form to fullfill.
+ */
function selectHiddenManagementForType(tab, form) {
let type_hidden_field = form.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="type"]'
);
+
if (tab.classList.contains("active")) {
//Fullfill hidden field
let type_field_search = tab
@@ -127,18 +195,116 @@ function selectHiddenManagementForType(tab, form) {
}
}
+/**
+ * Manage the report broken links hidden form
+ */
+function fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink) {
+ formBrokenLink.querySelector(
+ "input[name='resource']"
+ ).value = JSON.stringify({ "@id": event.target.dataset.src });
+
+ formBrokenLink.querySelector(
+ "input[name='submitter']"
+ ).value = JSON.stringify({ "@id": userWhoSubmitReport });
+}
+
+/**
+ * Manage the accordion for step in entrepreneur dashboard
+ */
+function manageAccordionByStep(){
+ var acc = document.getElementsByClassName("accordion");
+ var i;
+
+ for (i = 0; i < acc.length; i++) {
+ acc[i].addEventListener("click", function() {
+ if (this.classList.contains("active") == true) {
+ this.classList.remove("active");
+ this.nextElementSibling.querySelector(
+ "sib-form + div"
+ ).style.maxHeight = "0px";
+ } else {
+ this.classList.add("active");
+ }
+
+ this.closest(".step")
+ .querySelector("nav")
+ .removeAttribute("hidden");
+ refreshPagination();
+
+ var panel = this.nextElementSibling.querySelector("sib-form + div");
+
+ if (panel.style.maxHeight) {
+ panel.style.maxHeight = null;
+ } else {
+ panel.style.maxHeight = panel.scrollHeight + "px";
+ }
+ });
+ }
+}
+
+/**
+ * Manage the accordion for requested resources in the mentor dashboard
+ */
+function manageAccordionForRequest() {
+ 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 (!this.classList.contains("active")) {
+ panelRequest.style.maxHeight = null;
+ refreshPagination();
+ } else {
+ panelRequest.style.maxHeight = panelRequest.scrollHeight + "px";
+ }
+ });
+ }
+}
+
+/**
+ * Manage the action of the logout button
+ */
+function manageLogoutButton() {
+ const logoutButtons = document.getElementsByClassName("logout-button");
+ for (var i = 0; i < logoutButtons.length; i++) {
+ logoutButtons[i].addEventListener("click", function() {
+ window.dispatchEvent(
+ new CustomEvent("requestNavigation", {
+ detail: { route: "splash-index" }
+ })
+ );
+ document.querySelector("sib-auth").logout();
+ setTimeout(function() {
+ location.reload();
+ }, 1000);
+ });
+ }
+}
+
+/**
+ * For entrepreneur dashboard only :
+ * As we cannot have multiple imbricated filtering with the native sib-display, we manage it manually.
+ * @param {String} targetId - Id of the element to update
+ */
function addProperFilterToSearchComponents(targetId) {
var baseElement = document.getElementById(targetId);
var forms = baseElement.querySelectorAll(".resource_by_step");
forms.forEach(form => {
form.addEventListener("populate", e => {
//Manage fake tabs
- let tabs = document.getElementsByClassName("filter_by_type");
+ let tabs = baseElement.getElementsByClassName("filter_by_type");
for (let tab of tabs) {
selectHiddenManagementForType(tab, form);
}
- //On load in dashbord Entrepreneur
+ //Manage the pagination
refreshPagination();
//SEARCH BY KEYWORD
@@ -146,21 +312,32 @@ function addProperFilterToSearchComponents(targetId) {
//https://git.happy-dev.fr/startinblox/framework/sib-core/issues/379
//TODO: Wait for a solution to filter with multiple value with "OR" instead of "AND".
let keyword_form = baseElement.querySelectorAll(".search-by-keyword")[0];
- let keyword_field = keyword_form.querySelector(`input[name="keyword"]`);
+ let keyword_field = keyword_form.querySelector(
+ `input[name="name_keyword"]`
+ );
let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
let keyword_hidden_fields = baseElement.querySelectorAll(
'hidden-widget[name="search_for_a_resource"] input'
);
- keyword_submit.addEventListener("click", function() {
- keyword_hidden_fields.forEach(hidden_field => {
- hidden_field.setAttribute("value", keyword_field.value);
- let parent_form = hidden_field.closest("sib-form");
- parent_form.component.inputChange();
- refreshPagination();
+ if (keyword_field) {
+ let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
+ let keyword_hidden_fields = baseElement.querySelectorAll(
+ 'hidden-widget[name="search_for_a_resource"] input'
+ );
+
+ keyword_submit.addEventListener("click", function() {
+ keyword_hidden_fields.forEach(hidden_field => {
+ hidden_field.setAttribute("value", keyword_field.value);
+ hidden_field.value = keyword_field.value;
+
+ let parent_form = hidden_field.closest("sib-form");
+ parent_form.component.inputChange();
+ refreshPagination();
+ });
});
- });
+ }
//SEARCH IN DATABASE INSTANCE ONLY
let instance_only = baseElement.querySelectorAll(
@@ -184,12 +361,11 @@ function addProperFilterToSearchComponents(targetId) {
// https://git.happy-dev.fr/startinblox/framework/sib-core/issues/453
window.setTimeout(() => {
//Manage fake tabs for type
- let tabs = document.getElementsByClassName("filter_by_type");
+ let tabs = baseElement.getElementsByClassName("filter_by_type");
for (let tab of tabs) {
- tab.addEventListener(
- "click",
- selectHiddenManagementForType(tab, form)
- );
+ tab.addEventListener("click", function() {
+ selectHiddenManagementForType(tab, form);
+ });
}
//To retrieve format
@@ -279,7 +455,7 @@ function addProperFilterToSearchComponents(targetId) {
'hidden-widget[name="more_criterias_hidden"] input[name="country"]'
);
- if (year_field_search) {
+ if (country_field_search) {
country_field_search.addEventListener("input", function() {
country_hidden_fields.forEach(field => {
inputHiddenManagement(field, country_field_search, form);
@@ -291,6 +467,11 @@ function addProperFilterToSearchComponents(targetId) {
});
}
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXX ON LOAD XXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
jQuery(document).ready(function($) {
//Refresh pagination
refreshPagination();
@@ -298,11 +479,16 @@ jQuery(document).ready(function($) {
// Get the element with id="defaultOpen" and click on it
document.getElementById("defaultOpen").click();
+ //Retrieve the current user
let userAccountDataSrc = document.getElementById("user-account-picture");
+
+ //Add the current user as reviewer.
linkDatasetToField(userAccountDataSrc, "validation-form", "reviewer");
linkDatasetToField(userAccountDataSrc, "improvement-dialog-form", "reviewer");
linkDatasetToField(userAccountDataSrc, "refusal-dialog-form", "reviewer");
+ linkDatasetToField(userAccountDataSrc, "change_status_request", "reviewer");
+ //On form submission, we sometime have to refresh a list.
refreshList("resource-creation-form", "resources-history");
refreshList("validation-form", "pending-resources");
refreshList("refusal-dialog-form", "pending-resources");
@@ -321,6 +507,7 @@ jQuery(document).ready(function($) {
refreshList("mentor_profile_edition", "mentor_complementary");
refreshList("mentor_profile_edition", "mentor_contact");
refreshList("mentor_profile_edition", "user-account-picture");
+ refreshList("change_status_request", "request-list");
var header_dropdown = $(".dropdownWrapper"),
drop_choices = header_dropdown.find(".dropdownLabel");
@@ -337,44 +524,37 @@ jQuery(document).ready(function($) {
});
}
- const logoutButtons = document.getElementsByClassName("logout-button");
- for (var i = 0; i < logoutButtons.length; i++) {
- logoutButtons[i].addEventListener("click", function() {
- window.dispatchEvent(
- new CustomEvent("requestNavigation", {
- detail: { route: "splash-index" }
- })
- );
- document.querySelector("sib-auth").logout();
- setTimeout(function() {
- location.reload();
- }, 1000);
- });
- }
+ //Manage the logout action
+ manageLogoutButton();
- //MENTOR DASHBOARD*************************************************************
+ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXX MENTOR DASHBOARD XXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
window.setTimeout(() => {
- //Manage the accordion in request mentor dashboard.
- var accRequest = document.querySelectorAll(
- "#requests accordion-request-resource"
+ //Manage the form to report broken link.
+ let detailsMentor = document.getElementById("detail-mentor");
+ detailsMentor.addEventListener("populate", event => {
+ var userWhoSubmitReport = userAccountDataSrc.dataset.src
+ var formBrokenLink = document.getElementById("report-broken-link-mentor");
+ fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink);
+ });
+
+ 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";
+ }
- 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";
- }
- });
+ for (let item of previewImage) {
+ item.addEventListener("change", loadFile);
}
+ //Manage the accordion in request mentor dashboard.
+ manageAccordionForRequest()
+
//Refresh data list on delete resources
const deleteButton = document.querySelectorAll("sib-delete");
for (var i = 0; i < deleteButton.length; i++) {
@@ -384,7 +564,6 @@ jQuery(document).ready(function($) {
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"
@@ -397,29 +576,27 @@ jQuery(document).ready(function($) {
})
);
});
- }
- }, 2000);
-
- //ENTREPRENEUR DASHBOARD*************************************************************
-
- window.setTimeout(() => {
- //Accordion by step
- var acc = document.getElementsByClassName("accordion");
- var i;
+ };
+
+ //Manage the form to report broken link.
+ let detailsEntrepreneur = document.getElementById("detail-entrepreneur");
+ detailsEntrepreneur.addEventListener("populate", event => {
+ var formBrokenLink = document.getElementById("report-broken-link-entrepreneur");
+ var userWhoSubmitReport = userAccountDataSrc.dataset.src
+ fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink);
+ });
- for (i = 0; i < acc.length; i++) {
- acc[i].addEventListener("click", function() {
- this.classList.toggle("active");
+ }, 3000);
- var panel = this.nextElementSibling.querySelector("sib-form + div")
+ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX ENTREPRENEUR DASHBOARD XXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
- if (panel.style.maxHeight) {
- panel.style.maxHeight = null;
- } else {
- panel.style.maxHeight = panel.scrollHeight + "px";
- }
- });
- }
+ window.setTimeout(() => {
+ //Manage accordion by step
+ manageAccordionByStep();
+ refreshPagination();
}, 2000);
//In the entrepreneur dashboard, we set data from the display form to the hidden ones.
diff --git a/src/styles/index.scss b/src/styles/index.scss
index d3cc90ba5129a95e3863cf088fae17ae537e5057..e8894321db49d1e36f081aa8b4f1629863c1e745 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -226,7 +226,8 @@ body{
box-shadow: none;
}
-.button_base, input[type="submit"], #mentor-resource-detail a, #entrepreneur-resource-detail a, .sib-conversation form input[type="submit"]{
+.button_base, input[type="submit"], #mentor-resource-detail a, #entrepreneur-resource-detail a,
+#mentor-resource-validate a, .sib-conversation form input[type="submit"]{
transition: all .3s ease-in-out;
background-color: var(--bg-btn-base);
color: var(--bg-block);
@@ -241,7 +242,8 @@ body{
width: auto;
cursor: pointer;
}
-.button_base:hover, input[type="submit"]:hover, #mentor-resource-detail a:hover, #entrepreneur-resource-detail a:hover,.sib-conversation form input[type="submit"]:hover{
+.button_base:hover, input[type="submit"]:hover, #mentor-resource-detail a:hover, #mentor-resource-validate a:hover,
+#entrepreneur-resource-detail a:hover,.sib-conversation form input[type="submit"]:hover{
background-color: var(--bg-block);
color: var(--bg-btn-base);
}
@@ -346,7 +348,7 @@ p{
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXX ICONES XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
-.ico_gauche, #mentor-resource-detail a, #entrepreneur-resource-detail a, #entrepreneur-resource-list cs-display-property[name="name"] p{
+.ico_gauche, #mentor-resource-detail a, #mentor-resource-validate a, #entrepreneur-resource-detail a, #entrepreneur-resource-list cs-display-property[name="name"] p{
padding-left: 3.5rem;
position: relative;
}
@@ -355,7 +357,7 @@ p{
position: relative;
}
-.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before, #entrepreneur-resource-detail a:before,#entrepreneur-resource-list cs-display-property[name="name"] p:before, #confirm_suppress button:before{
+.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before, #mentor-resource-validate a:before, #entrepreneur-resource-detail a:before,#entrepreneur-resource-list cs-display-property[name="name"] p:before, #confirm_suppress button:before{
font-family: "Font Awesome 5 pro";
font-weight: 900;
position : absolute;
@@ -379,7 +381,7 @@ ico_droite:before{
.ico_search:before{
content: "\f002";
}
-#mentor-resource-detail a:before, #entrepreneur-resource-detail a:before{ /* ico link to ressource dans détail ressources*/
+#mentor-resource-detail a:before, #mentor-resource-validate a:before, #entrepreneur-resource-detail a:before{ /* ico link to ressource dans détail ressources*/
content:"\f0c1";
}
.ico_arrow:before{
@@ -411,11 +413,13 @@ ico_droite:before{
overflow: hidden;
display: block;
}
-
-sib-form-label-text, sib-form-dropdown, sib-multiple-select,cs-form-password{
+sib-form-label-text, sib-multiple-select, sib-form-dropdown, sib-form-auto-completion, sib-form-number{
display: block;
width: 48.5%;
}
+sib-multiple-select > sib-form-auto-completion {
+ width: 100%;
+}
sib-form-label-text[name="linkedin"],sib-form-label-text[name="twitter"]{
width: 100%;
}
@@ -456,7 +460,8 @@ input, textarea, select, form .ss-main .ss-multi-selected{
input:focus, textarea:focus{
background: var(--bg-form-focus);
}
-.title_form,.title_form p, cs-section_introduction h2, div#mentor-resource-detail cs-display-property[name="name"] p, div#entrepreneur-resource-detail cs-display-property[name="name"] p{
+.title_form,.title_form p, cs-section_introduction h2, div#mentor-resource-detail cs-display-property[name="name"] p,
+div#mentor-resource-validate cs-display-property[name="name"] p, div#entrepreneur-resource-detail cs-display-property[name="name"] p{
font-family: 'var(--typo)';
font-size: 2.2rem;
text-align: left;
@@ -634,7 +639,7 @@ header#header img[alt="Coopstarter"] {
background: blue;
margin-right: 5rem;
}
-header#header .avatar img, #mentor-resource-detail .avatar img, #entrepreneur-resource-detail .avatar img{
+header#header .avatar img, #mentor-resource-detail .avatar img, #mentor-resource-validate .avatar img, #entrepreneur-resource-detail .avatar img{
border-radius: 50%;
}
@@ -816,7 +821,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
#entrepreneur-resource-list container, #public-resource-list container, #mentor-database container{
padding-top: 3.5rem;
- input[name="keyword"]{
+ sib-form-placeholder-text[name="name_keyword"]{
float: left;
width: 76%;
}
@@ -824,7 +829,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
float: right;
margin-top: 0;
width: 20%;
- top: -1rem;
+ top: -3.5rem;
}
cs-section_header[name="header_criterias"] h2.title_form{
font-family: 'var(--typo-btn)';
@@ -862,16 +867,16 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
cs-display-property[name="name"] p{
float: left;
}
- sib-multiple[name="format"]{
+ cs-display-resource-property[name="format.name"]{
float: right;
}
cs-display-property[name="publication_year"] p{
clear: both;
}
- cs-display-multiple-property[name="format"] p{
+ cs-display-resource-property[name="format.name"] p{
border-radius: 5px;
background-color: #5DC6F2;
- padding: .5rem;
+ padding: .5rem;
font-family: 'var(--typo-btn)';
color: var(--bg-block);
text-decoration: none;
@@ -883,7 +888,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
margin: .5rem;
transition: .4s all ease-in;
}
- cs-display-multiple-property[name="format"] p:hover{
+ cs-display-resource-property[name="format.name"] p:hover{
background-color: var(--bg-block);
color: #5DC6F2;
}
@@ -1068,6 +1073,13 @@ sib-display#pending-resources div{
display: block;
}
+cs-display-resource-property.contenu_list{
+ display: block;
+ p {
+ float: left;
+ }
+}
+
div .contenu_list p, div .contenu_list label{
color: var(--clr-typo-base);
font-size: 1.4rem;
@@ -1240,12 +1252,12 @@ cs-display-step-property[label="Step"] p{
float: left;
padding-bottom: .5rem;
}
-cs-display-multiple-property[label="Format:"] p{
- width: auto;
- float: right;
- padding-bottom: .5rem;
-}
-sib-multiple[name="format"] + *{
+// cs-display-resource-property[label="Format:"] p{
+// width: auto;
+// float: right;
+// padding-bottom: .5rem;
+// }
+cs-display-resource-property[name="format.name"] + *{
clear: both;
}
sib-set-default[name="submitter_info"]{
@@ -1262,7 +1274,8 @@ sib-set-default[name="submitter_info"]{
}
}
/* XXXXXXXXXXXXXXXXXXXXXXXXX Modal XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
-#confirm_suppress, #resource-validation-process{
+#confirm_suppress, #confirm_status_change, #resource-validation-process,
+#resource-validation-process-confirmation {
border: none;
top: 0;
padding: 0;
@@ -1298,7 +1311,7 @@ sib-set-default[name="submitter_info"]{
text-align: center;
}
}
-#resource-validation-process{
+#resource-validation-process, #resource-validation-process-confirmation{
padding-bottom: 30%;
&> div{
width: 75%;
@@ -1328,7 +1341,7 @@ sib-set-default[name="submitter_info"]{
}
}
}
-#mentor-resource-detail, #entrepreneur-resource-detail{
+#mentor-resource-detail, #entrepreneur-resource-detail, #mentor-resource-validate{
border: none;
top: 0;
padding: 0;
@@ -1356,14 +1369,13 @@ sib-set-default[name="submitter_info"]{
margin: 0 0 1.5rem 0;
padding: 0;
p {
- font-size: 2.2rem;
- margin: 0 0 2rem 0;
- font-weight: normal;
- padding-top: 0;
- }
-
+ font-size: 2.2rem;
+ margin: 0 0 2rem 0;
+ font-weight: normal;
+ padding-top: 0;
}
- cs-display-multiple-property[name="format"] p{
+ }
+ cs-display-resource-property[name="format.name"] p{
text-align: right;
}
.avatar{
@@ -1409,7 +1421,7 @@ sib-set-default[name="submitter_info"]{
}
}
-#mentor-resource-detail a, #entrepreneur-resource-detail a{
+#mentor-resource-detail a, #mentor-resource-validate a, #entrepreneur-resource-detail a{
text-decoration: none;
display: inline-block;
margin: 0;
@@ -1551,7 +1563,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;
}
@@ -1598,3 +1610,12 @@ b, strong {
font-weight: bolder;
}
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXX Little tricks for 04/10 Démonstration XXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
+fake-like,
+fake-dislike {
+ display: none;
+}