diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug index dd61d2bf3e382a428e0fdb9522ab02c13710a3a5..9015e5488c00b2f673add0268e8751e40089282f 100644 --- a/src/includes/entrepreneur/resources/detail.pug +++ b/src/includes/entrepreneur/resources/detail.pug @@ -12,9 +12,10 @@ include ../../components/widgets sib-display( loader-id="detail-entrepreneur-loader" bind-resources, - fields='name, steps, format, content(preview_image, tags),\ + fields='name, steps, format, \ 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,\ diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug index 2e4c775962165b753011c49a7d85e0c7473ee452..bcc42ccaf0603b3ba23ebcd3821457f79a996455 100644 --- a/src/includes/entrepreneur/resources/list.pug +++ b/src/includes/entrepreneur/resources/list.pug @@ -138,7 +138,7 @@ container.block_list.flex.flex_espace widget-description='cs-display-property' widget-fields='hidden-widget' widget-language="hidden-widget" - widget-author="cs-display-property" + widget-author="hidden-widget" widget-format='cs-display-multiple-property' label-format='' multiple-format @@ -147,6 +147,8 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields + next='entrepreneur-resource-detail' + paginate-by="5" ) @@ -190,7 +192,7 @@ container.block_list.flex.flex_espace widget-description='cs-display-property' widget-fields='hidden-widget' widget-language="hidden-widget" - widget-author="cs-display-property" + widget-author="hidden-widget" widget-format='cs-display-multiple-property' label-format='' multiple-format @@ -199,6 +201,8 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields + next='entrepreneur-resource-detail' + paginate-by="5" ) @@ -242,7 +246,7 @@ container.block_list.flex.flex_espace widget-description='cs-display-property' widget-fields='hidden-widget' widget-language="hidden-widget" - widget-author="cs-display-property" + widget-author="hidden-widget" widget-format='cs-display-multiple-property' label-format='' multiple-format @@ -251,6 +255,8 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields + next='entrepreneur-resource-detail' + paginate-by="5" ) @@ -295,7 +301,7 @@ container.block_list.flex.flex_espace widget-description='cs-display-property' widget-fields='hidden-widget' widget-language="hidden-widget" - widget-author="cs-display-property" + widget-author="hidden-widget" widget-format='cs-display-multiple-property' label-format='' multiple-format @@ -304,6 +310,8 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields + next='entrepreneur-resource-detail' + paginate-by="5" ) @@ -347,7 +355,7 @@ container.block_list.flex.flex_espace widget-description='cs-display-property' widget-fields='hidden-widget' widget-language="hidden-widget" - widget-author="cs-display-property" + widget-author="hidden-widget" widget-format='cs-display-multiple-property' label-format='' multiple-format @@ -356,51 +364,8 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields + next='entrepreneur-resource-detail' + paginate-by="5" ) -<<<<<<< HEAD - 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)', - 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-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-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 - label-language='' - multiple-language - label-fields='' - multiple-fields - - next='entrepreneur-resource-detail' - - paginate-by="5" - ) - -======= ->>>>>>> edb77e2a81e2f0e2e62e963e4d7af13c00fcbfbb diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug index 08f394178fa52c8f5b9638d97a69f78cd35052f9..8eb75dd70b7d4a9513ea580599fa86b21a633b93 100644 --- a/src/includes/mentor/resources/detail.pug +++ b/src/includes/mentor/resources/detail.pug @@ -8,9 +8,10 @@ include ../../components/widgets sib-display( bind-resources, - fields='name, steps, format, content(preview_image, tags),\ + fields='name, steps, format,\ 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,\