diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 0660933920b7f2156b4fc3959ec3a9886ff5904b..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>
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 9f54911f20c29cd2d3eabcdb8fd9c9780c13215b..4fa44af4bc54d2051f0891a000729148b237916a 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -7,9 +7,9 @@ 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.name, \
@@ -71,7 +71,7 @@ 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-entrepreneur'
)
//- Add likes here
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index cdc10ab3bf9d6242d923143a88f3000c6dd0599a..55cf9245bf94fed89141509ca1de121fd9cb4727 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
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/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 924f9702d5ecee0f534c19a5542098e91a445624..cf20f6a78515dd973cbcb056b19221595ccf3042 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -9,7 +9,7 @@ include ../../components/widgets
div#detail-mentor-loader
hidden Loading the resource, please wait...
- sib-display(
+ sib-display#detail-mentor(
loader-id="detail-mentor-loader"
bind-resources,
fields='name, steps, format.name,\
@@ -71,7 +71,7 @@ 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'
)
//TODO: implement likes here
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index 4f0d522c2a931440df38929d4ca5ee314ae04775..75c19e5897329875fb2089ff2eb8288db5653dc6 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -2,11 +2,15 @@ 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
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 e07ef4ffae43f3099e7e3df158947a70bcc37c1e..3b1fee99dd110bcbcb942dff8a9918074f87d380 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -72,7 +72,7 @@ sib-router
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'
)
p.p_entete
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index f90e586242e74d695a73642ea2a0af14e967d881..84d387e03b90f74ca5897bca30bcd5c221b4e81d 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -7,7 +7,8 @@ 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"
@@ -71,7 +72,7 @@ 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-public'
)
//- Add likes here
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index 92ffcd16d78bece3f2e4baccf7cbcff5a6749354..ba13d1bf44e1cbf505687fad7e1ffdef21b35cdc 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -1,5 +1,10 @@
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
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/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 8b2cde7c2d9a8d96fb3efcc4956714e892b8bdbc..15618f3af9a60051a94c4806dd2a09abe626757f 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -153,6 +153,17 @@ 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");
@@ -247,6 +258,11 @@ function addProperFilterToSearchComponents(targetId) {
`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'
+ );
+
if (keyword_field) {
let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
let keyword_hidden_fields = baseElement.querySelectorAll(
@@ -452,6 +468,14 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXX MENTOR DASHBOARD XXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
window.setTimeout(() => {
+ //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"
);
@@ -476,7 +500,6 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
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"
@@ -490,6 +513,15 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
);
});
};
+
+ //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);
+ });
+
}, 3000);
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX