diff --git a/src/includes/head.pug b/src/includes/head.pug
index 10553caa76da1c61ff9d62afa311e6498ffecc1e..4b43aee778e95d185e64517cfc3f1db793ad32eb 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -26,10 +26,11 @@ head
"entrepreneurProfile": "http://happy-dev.fr/owl/#entrepreneur_profile",
"mentorProfile": "http://happy-dev.fr/owl/#mentor_profile",
"account":"hd:account",
- "avatar":"foaf:depiction",
"picture":"foaf:depiction",
"messageSet":"http://happy-dev.fr/owl/#message_set",
"author":"http://happy-dev.fr/owl/#author_user",
- "title":"http://happy-dev.fr/owl/#title"
+ "title":"http://happy-dev.fr/owl/#title",
+ "avatar":"foaf:depiction",
+ "author.avatar":"foaf:depiction"
}
diff --git a/src/includes/mentor/components/menu.pug b/src/includes/mentor/components/menu.pug
index 982b9bdc1c9c97f8ea9230e3e9d7877a366897c0..860910eb24db0cf80c0fab3c479a72928d7c52d9 100644
--- a/src/includes/mentor/components/menu.pug
+++ b/src/includes/mentor/components/menu.pug
@@ -2,8 +2,7 @@ sib-router(default-route='mentor-resource-list' route-prefix=lang)
sib-route(name='mentor-resource-list')
sib-route(name='mentor-account', id-prefix=`${endpoints.users}`, use-id)
sib-route(name='mentor-account-edit', id-prefix=`${endpoints.users}`, use-id)
- sib-ac-checker(permission="acl:Read" bind-resources)
- sib-route(id-prefix=`${endpoints.users}`, name='mentor-account-view', use-id)
+ sib-route(id-prefix=`${endpoints.users}`, name='mentor-account-view', use-id)
sib-ac-checker(permission="acl:Write")
sib-route(name='mentor-resource-create')
sib-ac-checker(permission="acl:Write" bind-resources)
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 558df02ce796ac412c7470ed3094a62b951e5eb2..8ac670498c5540a6e5b56119c7eb0bcc178a9f09 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -102,7 +102,7 @@ sib-display(
bind-resources
fields=""
nested-field="conversations"
- counter-template=`<p>${data.Comments} (${counter})</p>`
+ counter-template=`<p>${data.Comments} (\${counter})</p>`
)
sib-conversation(
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 0185a28ad33f103045bb7f6c8a2e12df06921045..dad557cd80a3f83b365fcb4f9805acc84af8d7dd 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -8,7 +8,7 @@
hidden
i.fas.fa-spinner.fa-spin
- sib-display(
+ sib-display#detail-public(
loader-id="detail-public-loader"
bind-resources,
fields='name, steps, format.name,\
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index aa7655f2989676e6a25c5affe2b9a563c607588f..1575484606e887e797e69d778a62bf1af8f7eeb1 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -169,20 +169,14 @@ function refreshPagination() {
* @param {HTMLElement} option_selected - Option selcted to set in hidden select.
*/
function selectHiddenManagement(select_hidden, option_selected) {
- console.log("option_selected in selectHiddenManagement", option_selected)
- console.log("select_hidden in selectHiddenManagement", select_hidden)
options_hidden = select_hidden.getElementsByTagName("option");
for (let option_hidden of options_hidden) {
//Removing the selected attribute from previous selection
option_hidden.removeAttribute("selected");
- console.log("option_hidden.value",option_hidden.value)
- console.log("option_selected.value",option_selected.value)
if (option_hidden.value == option_selected.value) {
-console.log("we change the value")
//Actually selecting the option if it is the good one
option_hidden.setAttribute("selected", "selected");
select_hidden.setAttribute("value", option_selected.value);
- console.log("select_hidden", select_hidden)
break;
}
}
@@ -871,6 +865,25 @@ jQuery(document).ready(function($) {
var formBrokenLink = document.getElementById("report-broken-link-mentor");
fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink);
+ // Manage closing the detail dialog from the profile link access
+ var contributorProfileLinks = document.getElementsByTagName('cs-display-mentor-link');
+ for (let profileLink of contributorProfileLinks) {
+ let links = profileLink.getElementsByTagName('sib-link');
+ for (let link of links) {
+ link.addEventListener('click', function() {
+ let mentor_resource_detail = document.getElementById(
+ "mentor-resource-detail"
+ );
+ mentor_resource_detail.removeAttribute('open');
+
+ let mentor_database_detail = document.getElementById(
+ "mentor-database-resource-detail"
+ );
+ mentor_database_detail.removeAttribute('open');
+ });
+ };
+ };
+
// // Fill the hidden like-form
// document.querySelector('sib-auth').getUser().then(data=> {
// let targetFormLike = document.getElementById('add-like');
@@ -907,7 +920,7 @@ jQuery(document).ready(function($) {
initFileUpload("mentor_profile_creation", "account.picture");
initFileUpload("mentor_profile_edition", "account.picture");
refreshRequestList("change_status_request", "request_list");
-
+
//Manage the accordion in request mentor dashboard.
manageAccordionForRequest();
@@ -964,6 +977,38 @@ jQuery(document).ready(function($) {
initFileUpload("entrepreneur_profile_edition", "account.picture");
initFileUpload("entrepreneur_profile_creation", "account.picture");
+ let detailsSearcher = document.getElementById("detail-entrepreneur");
+ detailsSearcher.addEventListener("populate", event => {
+ var contributorProfileLinks = document.getElementsByTagName('cs-display-entrepreneur-link');
+ for (let profileLink of contributorProfileLinks) {
+ let links = profileLink.getElementsByTagName('sib-link');
+ for (let link of links) {
+ link.addEventListener('click', function() {
+ let entrepreneur_resource_detail = document.getElementById(
+ "entrepreneur-resource-detail"
+ );
+ entrepreneur_resource_detail.removeAttribute('open');
+ });
+ };
+ };
+ });
+
+ let detailsPublic = document.getElementById("detail-public");
+ detailsPublic.addEventListener("populate", event => {
+ var userProfileLinks = document.getElementsByTagName('cs-display-user-link');
+ for (let profileLink of userProfileLinks) {
+ let links = profileLink.getElementsByTagName('sib-link');
+ for (let link of links) {
+ link.addEventListener('click', function() {
+ let public_resource_detail = document.getElementById(
+ "public-resource-detail"
+ );
+ public_resource_detail.removeAttribute('open');
+ });
+ };
+ };
+ });
+
//Correct the native default of pagination
refreshPagination();
}, 3000);
diff --git a/src/styles/index.scss b/src/styles/index.scss
index a37ade7ae1bcbf5496f6b6fc9226b19747b61a88..839d94d7ca0f6730e9641ba5857e8fa667046b76 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -2024,36 +2024,54 @@ XXXXXXXXXXXXXXXXXXXXXXXX SPECIFICITES XXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
#mentor-database container .step cs-steps-header p,
-#entrepreneur-resource-list container .step cs-steps-header p{
+#entrepreneur-resource-list container .step cs-steps-header p,
+#public-resource-list container .step cs-steps-header p{
margin-bottom: 0;
}
-.accordion cs-steps-header[label="Étape 1"]>div,
-#entrepreneur-resource-list .accordion cs-steps-header[label="Étape 1 "]>div{
+.accordion cs-steps-header[label="Étape 1"]>div, .accordion cs-steps-header[label="Step 1"]>div
+#entrepreneur-resource-list .accordion cs-steps-header[label="Étape 1 "]>div,
+#entrepreneur-resource-list .accordion cs-steps-header[label="Step 1"]>div,
+#public-resource-list .accordion cs-steps-header[label="Étape 1 "]>div,
+#public-resource-list .accordion cs-steps-header[label="Step 1"]>div {
margin: 2rem 0;
}
- .accordion.active cs-steps-header[label="Étape 1"]>div,
-#entrepreneur-resource-list .accordion.active cs-steps-header[label="Étape 1 "]>div{
+.accordion.active cs-steps-header[label="Étape 1"]>div,
+.accordion.active cs-steps-header[label="Step 1"]>div,
+#entrepreneur-resource-list .accordion.active cs-steps-header[label="Étape 1"]>div,
+#entrepreneur-resource-list .accordion.active cs-steps-header[label="Step 1"]>div,
+#public-resource-list .accordion cs-steps-header[label="Étape 1 "]>div,
+#public-resource-list .accordion cs-steps-header[label="Step 1"]>div {
margin: 2rem 0 0 0;
}
-// #mentor-database .block_log.block_list>.step:first-child,
-// #entrepreneur-resource-list .block_log.block_list>.step:first-child{
-// padding-bottom: 0;
-// }
#mentor-database .keyword_submit.button__actions .button_base.ico_gauche,
-#entrepreneur-resource-list .keyword_submit.button__actions .button_base.ico_gauche{
+#entrepreneur-resource-list .keyword_submit.button__actions .button_base.ico_gauche,
+#public-resource-list .keyword_submit.button__actions .button_base.ico_gauche {
text-align: center;
padding: .8rem 1.9rem .8rem 1.9rem;
}
#mentor-resource-detail h2.title_form, #mentor-database-resource-detail h2.title_form{
font-weight: bold;
}
-#entrepreneur-resource-list container .step div sib-display >div, #public-resource-list container .step div sib-display >div, #mentor-database container .step div sib-display >div{
+#entrepreneur-resource-list container .step div sib-display >div,
+#public-resource-list container .step div sib-display >div,
+#mentor-database container .step div sib-display >div{
margin-top: 2rem;
}
-#mentor-account .block_list.flex, #entrepreneur-account .block_list.flex, #mentor-account-view .block_list.flex,
-#entrepreneur-account-view .block_list.flex, #user-account-view .block_list.flex, #mentor-resource-create .block_log {
+#mentor-database container.block_list .block_log,
+#public-resource-list container.block_list .block_log,
+#entrepreneur-resource-list container.block_list .block_log {
+ box-shadow: none;
+}
+#mentor-account .block_list.flex, #entrepreneur-account .block_list.flex, #mentor-account-view .block_list.flex,
+#entrepreneur-account-view .block_list.flex, #user-account-view .block_list.flex, #mentor-resource-create .block_log,
+#mentor-resource-edit .block_log {
margin-bottom: 19rem;
}
+
+#mentor-resource-create .block_creat_count, #mentor-resource-edit .block_creat_count {
+ overflow: initial;
+}
+
#entrepreneur-request-create sib-set-default[name="complementary_information"] cs-section_header[name="header_complementary"] h2{
margin-top:3rem;
}