diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug index 4e771484915e2bbd2402f1388a7f859bc0cf7c79..c409ff245926c9b751b34eca55c9252ffb8563f5 100644 --- a/src/includes/components/widgets.pug +++ b/src/includes/components/widgets.pug @@ -76,9 +76,41 @@ sib-widget(name='cs-display-checkbox') input(type='checkbox' name="instance_database_only") label(for="instance_database_only") Search in Coopstarter database only -sib-widget(name='cs-display-related-property') +sib-widget(name='cs-display-mentor-database-related') template - p #[a(href="${value.name}")] ${await value.name} + p + sib-link( + bind-resources + data-src="${await value}" + next="mentor-database-resource-detail" + ) ${await value.name} + +sib-widget(name='cs-display-mentor-related') + template + p + sib-link( + bind-resources + data-src="${await value}" + next="mentor-resource-detail" + ) ${await value.name} + +sib-widget(name='cs-display-public-related') + template + p + sib-link( + bind-resources + data-src="${await value}" + next="public-resource-detail" + ) ${await value.name} + +sib-widget(name='cs-display-entrepreneur-related') + template + p + sib-link( + bind-resources + data-src="${await value}" + next="entrepreneur-resource-detail" + ) ${await value.name} sib-widget(name='cs-display-multiple-property') template diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug index b1c9509b3421ff0d030862cfcd5a3604c0cc7c7c..2246a924acb9bc2c6de2dad7132658db92b5f34d 100644 --- a/src/includes/entrepreneur/resources/detail.pug +++ b/src/includes/entrepreneur/resources/detail.pug @@ -120,18 +120,15 @@ nested-field="conversations" ) - //- h2.title_lead_avenir=`${data.RelatedResources}` + h2.title_lead_avenir=`${data.RelatedResources}` - //- sib-display( - //- bind-resources, - //- nested-field="related" - //- fields="name, detail" - - //- widget-name='cs-display-property' - //- label-detail='' - //- widget-detail='sib-action' - //- action-detail='entrepreneur-resource-detail' - //- ) + sib-display( + bind-resources + fields="related" + multiple-related + widget-related='cs-display-entrepreneur-related' + label-related='' + ) diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug index f34fb096e76e9d8d25ab5e50c616877f3bee4a2d..d30d8763b357b296e431b437e3f7b0cf2f3c84c9 100644 --- a/src/includes/mentor/dashboard.pug +++ b/src/includes/mentor/dashboard.pug @@ -37,8 +37,19 @@ section#home div#detail-mentor-loader hidden i.fas.fa-spinner.fa-spin + include resources/detail.pug + h2.title_lead_avenir=`${data.RelatedResources}` + + sib-display( + bind-resources + fields="related" + multiple-related + widget-related='cs-display-mentor-related' + label-related='' + ) + #mentor-database(hidden).no-sidebar.container include resources/database.pug @@ -55,6 +66,16 @@ section#home include resources/detail.pug + h2.title_lead_avenir=`${data.RelatedResources}` + + sib-display( + bind-resources + fields="related" + multiple-related + widget-related='cs-display-mentor-database-related' + label-related='' + ) + #mentor-resource-create(hidden).no-sidebar.container sib-link(class="backlink", next="mentor-resource-list")=`${data.BackToDashboard}` include resources/create.pug diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug index f791b3c15329e0709a9d02daa13169d9498a5725..875da38f7838468ca5567ccb412e43c1800f6a4d 100644 --- a/src/includes/mentor/resources/detail.pug +++ b/src/includes/mentor/resources/detail.pug @@ -110,18 +110,5 @@ sib-conversation( nested-field="conversations" ) -//- h2.title_lead_avenir=`${data.RelatedResources}` - -//- sib-display( -//- bind-resources, -//- nested-field="related" -//- fields="name, detail" - -//- widget-name='cs-display-property' -//- label-detail='' -//- widget-detail='sib-action' -//- action-detail='mentor-resource-detail' -//- ) - diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug index be2e29e2467aeab7acd4c01b69f3f6d3ea7539f8..0caf27428ee6372948aa69ce430ac69da979fa05 100644 --- a/src/includes/public/resources/detail.pug +++ b/src/includes/public/resources/detail.pug @@ -70,8 +70,8 @@ label-country.name=`${data.Country}` label-submitter.mentorProfile.organisation.name=`${data.Organisation}` label-author=`${data.Author}` - label-submitter=`${data.ResourcePostedBy}` - label-review.reviewer=`${data.ResourceValidatedBy}` + label-submitter=`${data.ResourcePostedBy}: ` + label-review.reviewer=`${data.ResourceValidatedBy}: ` action-broken='resource-report-broken-link-public' ) @@ -121,16 +121,14 @@ nested-field="conversations" ) - //- h2.title_lead_avenir=`${data.RelatedResources}` + + h2.title_lead_avenir=`${data.RelatedResources}` - //- sib-display( - //- bind-resources, - //- nested-field="related" - //- fields="name, detail" - - //- widget-name='cs-display-property' - //- label-detail='' - //- widget-detail='sib-action' - //- action-detail='public-resource-detail' - //- ) + sib-display( + bind-resources + fields="related" + multiple-related + widget-related='cs-display-public-related' + label-related='' + ) diff --git a/src/styles/index.scss b/src/styles/index.scss index 78e387a836c2787ee6fb7b1683814e08f7f25337..18cd59d786a440b0881b54ca3023a9778882b7ea 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1668,7 +1668,9 @@ div#entrepreneur-resource-detail cs-display-property[name="name"].title_form p { } sib-set-default[name="specifications"]>cs-display-resource-property, -sib-set-default[name="specifications"]>sib-multiple { +sib-set-default[name="specifications"]>sib-multiple, +cs-display-entrepreneur-related, cs-display-mentor-related, +cs-display-mentor-database-related, cs-display-public-related { display: block; float: left; width: 33%; @@ -1684,6 +1686,12 @@ sib-set-default[name="specifications"]>sib-multiple { } } +cs-display-entrepreneur-related, cs-display-mentor-related, +cs-display-mentor-database-related, cs-display-public-related { + cursor: pointer; + margin-left: 1px; +} + .sib-conversation div.conversation-form{ border: none; position: relative;