diff --git a/src/includes/account-creation.pug b/src/includes/account-creation.pug index 3108be52c0c7fc1f6c861cb1281d60ef02b662fb..9bf084606bca5d2d872ed2f2a952e8c75a9e2989 100644 --- a/src/includes/account-creation.pug +++ b/src/includes/account-creation.pug @@ -1,7 +1,7 @@ -sib-router(default-route='account-creation-index') - sib-route(name='account-creation-index') - sib-route(name='mentor-new-account') - sib-route(name='entrepreneur-new-account') +solid-router(default-route='account-creation-index') + solid-route(name='account-creation-index') + solid-route(name='mentor-new-account') + solid-route(name='entrepreneur-new-account') #account-creation-index(hidden).flex figure(class="logo") @@ -9,7 +9,7 @@ sib-router(default-route='account-creation-index') h2.title_lead=`${data.Welcome}` - sib-link.block_log(next='mentor-new-account') + solid-link.block_log(next='mentor-new-account') div figure.img_log img(src=`${client_domain}/images/mentor.png` @@ -17,7 +17,7 @@ sib-router(default-route='account-creation-index') p.p_entete=`${data.WhatIsAContributor}` h2.button_base=`${data.IAmContributor}` - sib-link.block_log(next='entrepreneur-new-account') + solid-link.block_log(next='entrepreneur-new-account') div figure.img_log img(src=`${client_domain}/images/fusee.png` diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug index 3a972f64420ef2f1f1fef01708b12c13c0338ee2..875380d74a2108528d9e1d22de5b3019d7724911 100644 --- a/src/includes/components/widgets.pug +++ b/src/includes/components/widgets.pug @@ -1,63 +1,63 @@ -sib-widget(name='cs-section_header') +solid-widget(name='cs-section_header') template h2.title_form ${label} -sib-widget(name='cs-display-resource-property') +solid-widget(name='cs-display-resource-property') template p #[b ${label}] ${value} -sib-widget(name='cs-display-resource-comment') +solid-widget(name='cs-display-resource-comment') template div ${await value ? `<h3 class="title_form">Improvement suggestion</h3><p class="improvement_comment">${value}</p>` : ``} -sib-widget(name='cs-display-mentor-link') +solid-widget(name='cs-display-mentor-link') template p #[b ${label}] - sib-link( + solid-link( bind-resources data-src="${await value}" next="mentor-account-view" ) ${await value.name} -sib-widget(name='cs-display-entrepreneur-link') +solid-widget(name='cs-display-entrepreneur-link') template p #[b ${label}] - sib-link( + solid-link( bind-resources data-src="${await value}" next="entrepreneur-account-view" ) ${await value.name} -sib-widget(name='cs-display-user-link') +solid-widget(name='cs-display-user-link') template p #[b ${label}] - sib-link( + solid-link( bind-resources data-src="${await value}" next="user-account-view" ) ${await value.name} -sib-widget(name='cs-display-property') +solid-widget(name='cs-display-property') template p ${await value} -sib-widget(name='cs-display-page-title') +solid-widget(name='cs-display-page-title') template h2.title_lead.fd_bleu ${value} -sib-widget(name='cs-steps-resources-multiple') +solid-widget(name='cs-steps-resources-multiple') template div.resource_resume_header p ${await value.name} p ${await value.publication_year} p ${await value.description} -sib-widget(name='cs-steps-header') +solid-widget(name='cs-steps-header') template div p #[b ${label} :] ${value} -sib-widget(name='cs-display-link') +solid-widget(name='cs-display-link') template p a( @@ -66,178 +66,178 @@ sib-widget(name='cs-display-link') target="_blank" ) ${label} -sib-widget(name='cs-display-label') +solid-widget(name='cs-display-label') template p ${label} -sib-widget(name='cs-display-title') +solid-widget(name='cs-display-title') template h3.title_lead_avenir ${label} //Do we need generalize this widget ? -sib-widget(name='cs-display-checkbox') +solid-widget(name='cs-display-checkbox') template input(type='checkbox' name="instance_database_only") label(for="instance_database_only") Search in Coopstarter database only -sib-widget(name='cs-display-mentor-database-related') +solid-widget(name='cs-display-mentor-database-related') template p - sib-link( + solid-link( bind-resources data-src="${await value}" next="mentor-database-resource-detail" ) ${await value.name} -sib-widget(name='cs-display-mentor-related') +solid-widget(name='cs-display-mentor-related') template p - sib-link( + solid-link( bind-resources data-src="${await value}" next="mentor-resource-detail" ) ${await value.name} -sib-widget(name='cs-display-public-related') +solid-widget(name='cs-display-public-related') template p - sib-link( + solid-link( bind-resources data-src="${await value}" next="public-resource-detail" ) ${await value.name} -sib-widget(name='cs-display-entrepreneur-related') +solid-widget(name='cs-display-entrepreneur-related') template p - sib-link( + solid-link( bind-resources data-src="${await value}" next="entrepreneur-resource-detail" ) ${await value.name} -sib-widget(name='cs-display-multiple-property') +solid-widget(name='cs-display-multiple-property') template p ${await value.name}, -sib-widget(name='cs-display-step-property') +solid-widget(name='cs-display-step-property') template p ${await value.name} -sib-widget(name='cs-resource-format-name') +solid-widget(name='cs-resource-format-name') template div p ${await value.name} -sib-widget(name='cs-resource-status') +solid-widget(name='cs-resource-status') template div ${await value == 'pending' ? `<div class="button_base button_pending">#{data.PendingValidation}</div>` : (await value == 'to_improve' ? `<div class="button_base button_improvement">#{data.ImprovementRequired}</div>` : (await value == 'validated' ? `<div class="button_base button_validated">#{data.Published}</div>` : `<div class="button_base button_disputed">#{data.Refused}</div>` ) ) } -sib-widget(name='cs-validate-action') +solid-widget(name='cs-validate-action') template div - sib-link.button_base( + solid-link.button_base( data-src="\${src}" next="\${value}" ) ${label} -sib-widget(name='cs-detail-action') +solid-widget(name='cs-detail-action') template div - sib-link.detailLink( + solid-link.detailLink( data-src="\${src}" next="\${value}" ) <i class="fas fa-eye"></i> -sib-widget(name='cs-edit-action') +solid-widget(name='cs-edit-action') template div - sib-link( + solid-link( data-src="\${src}" next="\${value}" ) <i class="fas fa-pen"></i> -sib-widget(name='cs-delete-action') +solid-widget(name='cs-delete-action') template div - sib-link( + solid-link( data-src="\${src}" next="confirm_suppress" ) <i class="fas fa-trash-alt"></i> -sib-widget(name='cs-broken-action') +solid-widget(name='cs-broken-action') template p - sib-link( + solid-link( data-src="\${src}" next="\${value}" ) <i class="fas fa-heart-broken"></i> ${label} -sib-widget(name='cs-request-status-action') +solid-widget(name='cs-request-status-action') template div - sib-link.button_base.pull-right( + solid-link.button_base.pull-right( data-src="\${src}" next="confirm_status_change" ) ${label} -sib-widget(name='cs-section_introduction') +solid-widget(name='cs-section_introduction') template div h2.title_form ${label} p= `${data.AboutYouExplanation}` -sib-widget(name='cs-about-field') +solid-widget(name='cs-about-field') template div br p ${label} -sib-widget(name='cs-account-picture') +solid-widget(name='cs-account-picture') template figure.avatar img(src="\${await value || '/images/alien.jpg'}", alt="Profile picture") -sib-widget(name='cs-profile-picture') +solid-widget(name='cs-profile-picture') template img(src="\${await value || '/images/alien.jpg'}", alt="Profile picture") -sib-widget(name='cs-preview-picture') +solid-widget(name='cs-preview-picture') template img(src="\${await value || ''}", alt="\${await value ? 'Preview of the resource' : ''}") -sib-widget(name="hidden-widget") +solid-widget(name="hidden-widget") template div(data-content style="display:none;") -sib-widget(name="fake-tabs") +solid-widget(name="fake-tabs") template h2.fake-tabs ${value} -sib-widget(name="fake-like") +solid-widget(name="fake-like") template p 99 <i class="fas fa-thumbs-up"></i> -sib-widget(name="fake-dislike") +solid-widget(name="fake-dislike") template p 18 <i class="fas fa-thumbs-down"></i> -sib-widget(name="accordion-request-resource") +solid-widget(name="accordion-request-resource") template div h2 ${value} -sib-widget(name="cs-form-file-custom") +solid-widget(name="cs-form-file-custom") template label(for="preview_image") - sib-form-file(upload-url=`${sdn}upload/` name="preview_image" ) + solid-form-file(upload-url=`${sdn}upload/` name="preview_image" ) -sib-widget(name="cs-account-profile-picture") +solid-widget(name="cs-account-profile-picture") template label(for="picture") - sib-form-file(upload-url=`${sdn}upload/` name="picture") + solid-form-file(upload-url=`${sdn}upload/` name="picture") -sib-widget(name="cs-display-twitter-button") +solid-widget(name="cs-display-twitter-button") template a.twitter-share-button( href=`` @@ -247,7 +247,7 @@ sib-widget(name="cs-display-twitter-button") ) i.fab.fa-twitter -sib-widget(name="cs-display-email-button") +solid-widget(name="cs-display-email-button") template a.email-share-button( href=`` @@ -255,11 +255,11 @@ sib-widget(name="cs-display-email-button") ) i.far.fa-envelope -sib-widget(name="iframe-video-resource") +solid-widget(name="iframe-video-resource") template div ${value} -sib-widget(name="cs-display-sharing") +solid-widget(name="cs-display-sharing") template p #[b ${label}] ${await value == 'https://api-staging.coopstarter.happy-dev.fr/sharingcriterias/3/' ? `public` : (await value == 'https://api-staging.coopstarter.happy-dev.fr/sharingcriterias/1/' ? `Private` : `Organisation` ) } diff --git a/src/includes/entrepreneur/components/header.pug b/src/includes/entrepreneur/components/header.pug index 7748c9c23177a85a6fdf207a9318a0829bf69320..a055f2407c60011dee0b7f7f34665973814112d9 100644 --- a/src/includes/entrepreneur/components/header.pug +++ b/src/includes/entrepreneur/components/header.pug @@ -1,23 +1,23 @@ .container .flex.flex_espace.flex_item_center - sib-link(next='entrepreneur-resource-list') + solid-link(next='entrepreneur-resource-list') figure.logo_head.margin_bord_ecran img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter") include menu.pug div.flex.flex_espace.flex_item_center - sib-form.languageChoice( + solid-form.languageChoice( data-src=`${endpoints.interfacelanguages}` fields='languages' range-languages=`${endpoints.interfacelanguages}` - widget-languages='sib-form-dropdown' + widget-languages='solid-form-dropdown' selected-languages=`${endpoints.interfacelanguages}1/` label-languages='' naked ) .dropdownWrapper - sib-display#entrepreneur_account_picture.dropdownLabel( + solid-display#entrepreneur_account_picture.dropdownLabel( bind-user nested-field="account" fields="foaf:depiction" @@ -27,10 +27,10 @@ div.dropdownPanel ul li - sib-link(next='entrepreneur-dashboard') + solid-link(next='entrepreneur-dashboard') p= data.Dashboard li - sib-link(next='entrepreneur-account') + solid-link(next='entrepreneur-account') p= data.MyAccount li a.logout-button diff --git a/src/includes/entrepreneur/components/menu.pug b/src/includes/entrepreneur/components/menu.pug index 194e9db81b87f576316892ee3df5ac722f3446e1..c626f81313bc7972bc62c828f6aae70444f8d66b 100644 --- a/src/includes/entrepreneur/components/menu.pug +++ b/src/includes/entrepreneur/components/menu.pug @@ -1,7 +1,7 @@ -sib-router(default-route='entrepreneur-resource-list') - sib-route(name='entrepreneur-resource-list') - sib-route(name='entrepreneur-account', id-prefix=`${endpoints.users}`, use-id) - sib-route(name='entrepreneur-account-edit', id-prefix=`${endpoints.users}`, use-id) - sib-route(name='entrepreneur-account-edit-confirmation') - sib-ac-checker(permission="acl:Read" bind-resources) - sib-route(id-prefix=`${endpoints.users}`, name='entrepreneur-account-view', use-id) \ No newline at end of file +solid-router(default-route='entrepreneur-resource-list') + solid-route(name='entrepreneur-resource-list') + solid-route(name='entrepreneur-account', id-prefix=`${endpoints.users}`, use-id) + solid-route(name='entrepreneur-account-edit', id-prefix=`${endpoints.users}`, use-id) + solid-route(name='entrepreneur-account-edit-confirmation') + solid-ac-checker(permission="acl:Read" bind-resources) + solid-route(id-prefix=`${endpoints.users}`, name='entrepreneur-account-view', use-id) \ No newline at end of file diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug index 17fd41684fb0aa36b16d818cf5ab589161bb4893..e871592f63c83415e511767353a154f64ccbb08f 100644 --- a/src/includes/entrepreneur/dashboard.pug +++ b/src/includes/entrepreneur/dashboard.pug @@ -9,17 +9,17 @@ header#header(role='banner') section#home //TODO: //-Distinguish the search form from the listing - //-Create two Sib-displays getting the resources by "types" + //-Create two solid-displays getting the resources by "types" // and grouped by steps // From two different endpoints I guess //-Work on the page architecture #entrepreneur-resource-list(hidden).no-sidebar.container include ./resources/list.pug - sib-router - sib-route( name='entrepreneur-request-create') - sib-route(id-prefix=`${endpoints.resources}`, name='entrepreneur-request-validation', use-id) - sib-route(id-prefix=`${endpoints.resources}`, name='entrepreneur-resource-detail', use-id) + solid-router + solid-route( name='entrepreneur-request-create') + solid-route(id-prefix=`${endpoints.resources}`, name='entrepreneur-request-validation', use-id) + solid-route(id-prefix=`${endpoints.resources}`, name='entrepreneur-resource-detail', use-id) dialog(open)#entrepreneur-request-create.no-sidebar.container include ./requests/create.pug diff --git a/src/includes/entrepreneur/profile/confirmation.pug b/src/includes/entrepreneur/profile/confirmation.pug index f2e1c83ec66a2fb848aed7916b2d3708122a4bd5..e634bc5282381f8942cc19ef6d625d334fca3c06 100644 --- a/src/includes/entrepreneur/profile/confirmation.pug +++ b/src/includes/entrepreneur/profile/confirmation.pug @@ -6,4 +6,4 @@ p.p_entete= data.ModificationsProperlySaved div div.flex h3.button_base - sib-link(next='entrepreneur-account')= data.BackToAccount \ No newline at end of file + solid-link(next='entrepreneur-resource-list')=`${data.BackToAccount}` diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug index 31c9547c6ad63c07d325f252e063217859c98048..833b554d8ca7643857a50b67408c50d858ab30a1 100644 --- a/src/includes/entrepreneur/profile/create.pug +++ b/src/includes/entrepreneur/profile/create.pug @@ -8,7 +8,7 @@ figure.logo.img_log h2.title_create=`${data.CompleteSearcherAccount}` -sib-form#entrepreneur_profile_creation.block_log.block_creat_count( +solid-form#entrepreneur_profile_creation.block_log.block_creat_count( partial bind-user fields="last_name, first_name, entrepreneurProfile.organisation, username" @@ -20,9 +20,9 @@ sib-form#entrepreneur_profile_creation.block_log.block_creat_count( label-entrepreneurProfile.organisation=`${data.Organisation}` class-entrepreneurProfile.organisation='form-label is-dark' - widget-entrepreneurProfile.organisation='sib-form-auto-completion' + widget-entrepreneurProfile.organisation='solid-form-auto-completion' - widget-username='sib-form-hidden' + widget-username='solid-form-hidden' submit-button=`${data.CompleteYourAccount}` next="entrepreneur-dashboard" diff --git a/src/includes/entrepreneur/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug index 10bba7b53cf1c73b615f5dcacea4a4e86aaeed7c..338f8ffe37cc25ed5743f8a6d57629c51060777a 100644 --- a/src/includes/entrepreneur/profile/detail.pug +++ b/src/includes/entrepreneur/profile/detail.pug @@ -5,11 +5,11 @@ div.block_list.flex div.button__actions.w_25 div.dashboard__database - sib-link(next='entrepreneur-database') + solid-link(next='entrepreneur-database') div.button_base.ico_gauche.ico_database=`${data.BrowseDatabase}` div.dashboard__database - sib-link(next='entrepreneur-resource-list') + solid-link(next='entrepreneur-resource-list') div.button_base.ico_gauche.ico_search=`${data.BackToDashboard}` div.dashboard__database @@ -18,10 +18,10 @@ div.block_list.flex )=`${data.Logout}` div.profile_information.block_log.w_75 - sib-link(next='entrepreneur-account-edit') + solid-link(next='entrepreneur-account-edit') button.button_edit <i class="fas fa-pen" aria-hidden="true"></i> - sib-display#entrepreneur_info( + solid-display#entrepreneur_info( bind-user fields='account.picture, name, username, entrepreneurProfile.organisation.name, registeredOn' widget-name='cs-display-property' @@ -31,7 +31,7 @@ div.block_list.flex widget-entrepreneurProfile.registeredOn='cs-display-property' ) - sib-display#entrepreneur_contact( + solid-display#entrepreneur_contact( bind-user fields='email' label-email=`${data.Email} : ` diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug index 71b58d2de5008fe263cb830c1bc82bf9c882fae4..cb7369fc296437b705dddd4de935573217c38f28 100644 --- a/src/includes/entrepreneur/profile/edit.pug +++ b/src/includes/entrepreneur/profile/edit.pug @@ -1,6 +1,6 @@ h2.title_create= data.EditYourAccount -sib-form#entrepreneur_profile_edition.block_log.block_creat_count( +solid-form#entrepreneur_profile_edition.block_log.block_creat_count( partial bind-user fields="info(last_name, first_name, username, email)" @@ -8,7 +8,7 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count( label-first_name=`${data.Surname}` label-last_name=`${data.Name}` label-account.picture=`${data.Photo}` - widget-username="sib-form-hidden" + widget-username="solid-form-hidden" class-last_name='form-label is-dark input_big' class-first_name='form-label is-dark input_big' @@ -18,7 +18,7 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count( next='entrepreneur-account-edit-confirmation' ) -sib-form#entrepreneur_profile_organisation.block_log.block_creat_count( +solid-form#entrepreneur_profile_organisation.block_log.block_creat_count( partial bind-user nested-field="entrepreneurProfile" @@ -27,21 +27,21 @@ sib-form#entrepreneur_profile_organisation.block_log.block_creat_count( range-organisation=`${endpoints.organisations}` label-organisation=`${data.Organisation}` class-organisation='form-label is-dark input_big' - widget-organisation='sib-form-auto-completion' + widget-organisation='solid-form-auto-completion' submit-button=`${data.SaveModification}` next='entrepreneur-account-edit-confirmation' ) -sib-form#entrepreneur_profile_picture.block_log.block_creat_count( +solid-form#entrepreneur_profile_picture.block_log.block_creat_count( partial bind-user nested-field="account" fields="profile_picture(picture, slug, issuer)" extra-context="{'picture':'foaf:depiction'}" - widget-issuer="sib-form-hidden" - widget-slug="sib-form-hidden" + widget-issuer="solid-form-hidden" + widget-slug="solid-form-hidden" upload-url-picture=`${sdn}upload/` widget-picture='cs-account-profile-picture' class-picture='input_photo w_25' @@ -50,4 +50,4 @@ sib-form#entrepreneur_profile_picture.block_log.block_creat_count( next='entrepreneur-account-edit-confirmation' ) -sib-link(class="backlink", next="entrepreneur-account")= data.BackToDashboard \ No newline at end of file +solid-link(class="backlink", next="entrepreneur-account")= data.BackToDashboard \ No newline at end of file diff --git a/src/includes/entrepreneur/profile/view.pug b/src/includes/entrepreneur/profile/view.pug index 1823a8d8e64717e45248078be0d98e9a97beb344..7ee920549767fee48eb74f15330f90e9090f024c 100644 --- a/src/includes/entrepreneur/profile/view.pug +++ b/src/includes/entrepreneur/profile/view.pug @@ -1,5 +1,5 @@ div.container_min - sib-display( + solid-display( bind-resources fields='name' widget-name='cs-display-page-title' @@ -8,11 +8,11 @@ div.container_min div.block_list.flex div.button__actions.w_25 div.dashboard__database - sib-link(next='entrepreneur-resource-list') + solid-link(next='entrepreneur-resource-list') div.button_base.ico_gauche.ico_database=`${data.BrowseDatabase}` div.profile_information.block_log.w_75 - sib-display.user_info( + solid-display.user_info( bind-resources fields='account.picture, name, username, mentorProfile.headline, mentorProfile.city, mentorProfile.country.name, registered_on' widget-account.picture='cs-profile-picture' @@ -24,14 +24,14 @@ div.block_list.flex widget-mentorProfile.registered_on='cs-display-property' ) - sib-display.bold( + solid-display.bold( fields="" nested-field="resources" counter-template=`<p>\${counter} ${data.ResourcesUploadedHere}</p>` bind-resources ) - sib-display.user_complementary( + solid-display.user_complementary( bind-resources fields='biography_label, mentorProfile.biography, skills_label, mentorProfile.skills' widget-biography_label='cs-display-label' @@ -42,7 +42,7 @@ div.block_list.flex widget-mentorProfile.biography='cs-display-property' ) - sib-display.user_contact( + solid-display.user_contact( bind-resources fields='email, mentorProfile.phone, mentorProfile.linkedin, mentorProfile.twitter' label-email=`${data.Email} : ` diff --git a/src/includes/entrepreneur/request-submitted.pug b/src/includes/entrepreneur/request-submitted.pug index 3ce4acd4933c59c3a244d1ac6e7780631c2212bb..2da6ff10d5f041711932441cae1c90bb4eeff099 100644 --- a/src/includes/entrepreneur/request-submitted.pug +++ b/src/includes/entrepreneur/request-submitted.pug @@ -1,5 +1,5 @@ div.block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="entrepreneur-dashboard") + solid-link(class="backlink", next="entrepreneur-dashboard") i.fas.fa-times p=`${data.YouRequestHasBeenSubmitted}` \ No newline at end of file diff --git a/src/includes/entrepreneur/requests/create.pug b/src/includes/entrepreneur/requests/create.pug index b061daa03a2d61f6ba69becd48c202b2128b9be8..d2b7b43d23b6c1f33d4e83efca95fe5be371b0c6 100644 --- a/src/includes/entrepreneur/requests/create.pug +++ b/src/includes/entrepreneur/requests/create.pug @@ -1,5 +1,5 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="entrepreneur-dashboard") + solid-link(class="backlink", next="entrepreneur-dashboard") .like p.backlink i.fas.fa-times @@ -12,7 +12,7 @@ p.p_entete=`${data.RequestResourceInfo}` img(src=`${client_domain}/images/asid_entre.png` alt="Rechercher des ressources") - sib-form#request-creation-form( + solid-form#request-creation-form( loader-id="request-creation-form-loader" data-src=`${endpoints.requests}` fields="mandatory_information(header_mandatory, name, description, country, language),\ @@ -37,16 +37,14 @@ label-organisation=`${data.Organisation}` label-skills=`${data.SkillToLearn}` - 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' - - widget-description='sib-form-textarea' - widget-skills='sib-form-textarea' - widget-organisation='sib-form-auto-completion' + multiple-fields='solid-multiple-select' + widget-fields='solid-form-auto-completion' + widget-country='solid-form-auto-completion' + widget-language='solid-form-auto-completion' + + widget-description='solid-form-textarea' + widget-skills='solid-form-textarea' + widget-organisation='solid-form-auto-completion' submit-button=`${data.SendRequest}` next="entrepreneur-request-validation" diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug index 5ca6610c995ac47e0bd5fe987325ffb906facf2c..c92fcff96eb627fbd0bda5a5228a2a6a0aafdbe4 100644 --- a/src/includes/entrepreneur/resources/detail.pug +++ b/src/includes/entrepreneur/resources/detail.pug @@ -1,5 +1,5 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="entrepreneur-dashboard") + solid-link(class="backlink", next="entrepreneur-dashboard") .like p.backlink i.fas.fa-times @@ -7,7 +7,7 @@ div#detail-entrepreneur-loader hidden i.fas.fa-spinner.fa-spin - sib-display#detail-entrepreneur( + solid-display#detail-entrepreneur( loader-id="detail-entrepreneur-loader" bind-resources, fields='name, steps, format.name, \ @@ -86,14 +86,14 @@ //- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p> //- </div> - //- sib-display( + //- solid-display( //- bind-resources //- fields="" //- nested-field="likes" //- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>" //- ) - //- sib-display( + //- solid-display( //- bind-resources //- fields="" //- nested-field="dislikes" @@ -101,19 +101,19 @@ //- ) p.share SHARE : - sib-display.email-link( + solid-display.email-link( bind-resources fields="@id" widget-id='cs-display-email-button' ) - sib-display.twitter-link( + solid-display.twitter-link( bind-resources fields="@id" widget-id='cs-display-twitter-button' ) - sib-display( + solid-display( bind-resources fields="" nested-field="conversations" @@ -123,14 +123,14 @@ sib-conversation( bind-resources nested-field="conversations" - comment-input-label-text="Add a comment" - send-button-text="Send" - comment-input-placeholder-text="Your message here" + comment-input-label-text=`${data.AddAComment}` + send-button-text=`${data.Send}` + comment-input-placeholder-text=`${data.YourMessageHere}` ) h2.title_form.related=`${data.RelatedResources}` - sib-display( + solid-display( bind-resources fields="related" multiple-related diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug index 393e0e03a36a00c004f174ae907c88d4fceb2dce..d26450abd009334eed0daaf3e56b195177d8854e 100644 --- a/src/includes/entrepreneur/resources/list.pug +++ b/src/includes/entrepreneur/resources/list.pug @@ -1,5 +1,5 @@ -sib-router - sib-route( name='resource-report-broken-link-entrepreneur', use-id) +solid-router + solid-route( name='resource-report-broken-link-entrepreneur', use-id) dialog(open)#resource-report-broken-link-entrepreneur include ./resource-report-broken-link-entrepreneur @@ -21,19 +21,19 @@ container.block_list div#resources-loader hidden i.fas.fa-spinner.fa-spin - sib-form.search-by-keyword( + solid-form.search-by-keyword( data-src=`${endpoints.resources}`, loader-id="resources-loader" fields='keyword(name_keyword)' label-name_keyword=`${data.SearchByNam}` - widget-name_keyword="sib-form-placeholder-text" + widget-name_keyword="solid-form-placeholder-text" naked ) div.keyword_submit.button__actions div.button_base.ico_gauche=`${data.Search}` - //- sib-form.instance_database_only( + //- solid-form.instance_database_only( //- data-src=`${endpoints.resources}`, //- fields='instance_database_only' //- widget-instance_database_only='cs-display-checkbox' @@ -42,7 +42,7 @@ container.block_list //- naked //- ) - sib-form.more_criterias.flex.flex_espace( + solid-form.more_criterias.flex.flex_espace( data-src=`${endpoints.resources}`, fields='header_criterias, format, publication_year, country, languages, fields' label-header_criterias=`${data.Search}` @@ -58,17 +58,17 @@ container.block_list range-format=`${endpoints.formats}` range-country=`${endpoints.countries}` - multiple-country='sib-form-dropdown' - widget-country='sib-form-auto-completion' + multiple-country='solid-form-dropdown' + widget-country='solid-form-auto-completion' - multiple-languages='sib-form-dropdown' - widget-languages='sib-form-auto-completion' + multiple-languages='solid-form-dropdown' + widget-languages='solid-form-auto-completion' - multiple-format='sib-form-dropdown' - widget-format='sib-form-auto-completion' + multiple-format='solid-form-dropdown' + widget-format='solid-form-auto-completion' - multiple-fields='sib-form-dropdown' - widget-fields='sib-form-auto-completion' + multiple-fields='solid-form-dropdown' + widget-fields='solid-form-auto-completion' naked ) @@ -78,7 +78,7 @@ container.block_list img(src=`${client_domain}/images/asid_entre.png` alt="Rechercher des ressources") p=`${data.CantFindResourceYouNeed}` div.button__actions - sib-link(next='entrepreneur-request-create') + solid-link(next='entrepreneur-request-create') div div.button_base=`${data.MakeRequest}` @@ -86,14 +86,14 @@ container.block_list //Fake tabs to filter by type. div.tabs.flex_espace div(class='tablink filter_by_type active', onclick="openFakeTab(this)") - sib-display.type1( + solid-display.type1( data-src=`${endpoints.types}1/` fields='name' widget-name='fake-tabs' ) div(class='tablink filter_by_type', onclick="openFakeTab(this)") - sib-display.type2( + solid-display.type2( data-src=`${endpoints.types}2/` fields='name' widget-name='fake-tabs' @@ -107,7 +107,7 @@ container.block_list hidden i.fas.fa-spinner.fa-spin - sib-display( + solid-display( loader-id="resources-loader-step1" data-src=`${endpoints.steps}1/`, fields='name' @@ -119,7 +119,7 @@ container.block_list widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step1}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -131,16 +131,16 @@ container.block_list 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' @@ -158,7 +158,7 @@ container.block_list //Step 2 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}2/`, fields='name' class="accordion active" @@ -169,7 +169,7 @@ container.block_list widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step2}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -181,16 +181,16 @@ container.block_list 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' @@ -206,7 +206,7 @@ container.block_list ) div.step - sib-display( + solid-display( data-src=`${endpoints.steps}3/`, fields='name' class="accordion active" @@ -217,7 +217,7 @@ container.block_list widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step3}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -229,16 +229,16 @@ container.block_list 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -254,7 +254,7 @@ container.block_list //Step 4 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}4/`, fields='name' class="accordion active" @@ -266,7 +266,7 @@ container.block_list ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step4}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -278,16 +278,16 @@ container.block_list 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -303,7 +303,7 @@ container.block_list //Step 5 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}5/`, fields='name' class="accordion active" @@ -314,7 +314,7 @@ container.block_list widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step5}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -326,16 +326,16 @@ container.block_list 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -351,7 +351,7 @@ container.block_list //Step 6 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}6/`, fields='name' class="accordion active" @@ -362,7 +362,7 @@ container.block_list widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step6}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -374,16 +374,16 @@ container.block_list 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' diff --git a/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug b/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug index 4026a5595e9c1fbf1bb39a6dd1548ea88c369109..c2abaab9f71935049fafba1e16c435b94d11a893 100644 --- a/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug +++ b/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug @@ -1,16 +1,16 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="entrepreneur-resource-list") + solid-link(class="backlink", next="entrepreneur-resource-list") .like p i.fas.fa-times h2.title_lead_avenir=`${data.Thanks}` p=`${data.ConfirmSendBrokenLink}` - sib-form#report-broken-link-entrepreneur( + solid-form#report-broken-link-entrepreneur( data-src=`${endpoints.brokenlinks}` fields = "resource, submitter" - widget-resource='sib-form-hidden' - widget-submitter='sib-form-hidden' + widget-resource='solid-form-hidden' + widget-submitter='solid-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 6c93df1569f209300655be53394200cc7b375e88..a96c22ee6b2756a93af62ffe5f0e7cca108db04e 100644 --- a/src/includes/head.pug +++ b/src/includes/head.pug @@ -1,13 +1,13 @@ head title CoopStarter meta(charset="utf-8") - script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js") + //- script(type="module" src="/scripts/sib-core/dist/polyfill.js") //- script(type="module" src="/scripts/sib-core/dist/index.js") - script(type="module" src="https://unpkg.com/@startinblox/core@0.9") - script(type="module" src="https://unpkg.com/@startinblox/router@0.7") + script(type="module" src="https://unpkg.com/@startinblox/core@0.10") + script(type="module" src="https://unpkg.com/@startinblox/router@0.8") //- script(type="module" src="/scripts/sib-auth/index.js") script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8") - script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.4") + script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.5") script(src="https://kit.fontawesome.com/48014d2af3.js") script(src="https://unpkg.com/dialog-polyfill") script(src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous") @@ -37,12 +37,14 @@ head script(async src="https://platform.twitter.com/widgets.js" charset="utf-8") script(src="https://browser.sentry-cdn.com/5.15.5/bundle.min.js" integrity="sha384-wF7Jc4ZlWVxe/L8Ji3hOIBeTgo/HwFuaeEfjGmS3EXAG7Y+7Kjjr91gJpJtr+PAT" crossorigin="anonymous") link(rel="stylesheet" href="/styles/index.css") - sib-analytics( + solid-analytics( type="matomo" url="https://sib.matomo.cloud/" id="1" ) + script(type="module" src="/scripts/kb-reactivity.js" defer) + script(data-default-context, type="application/ld+json"). { diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug index 47dcf1f645d96a7d4145518a103a73c480235c48..11370ec25fe0607f0a83d9a912a02c880f5b62c2 100644 --- a/src/includes/mentor/components/header.pug +++ b/src/includes/mentor/components/header.pug @@ -1,24 +1,24 @@ .container .flex.flex_espace.flex_item_center - sib-link(next='mentor-dashboard') + solid-link(next='mentor-dashboard') figure.logo_head.margin_bord_ecran img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter") include menu.pug div.flex.flex_espace.flex_item_center - sib-form.languageChoice( + solid-form.languageChoice( data-src=`${endpoints.interfacelanguages}` fields='languages' range-languages=`${endpoints.interfacelanguages}` - widget-languages='sib-form-dropdown' + widget-languages='solid-form-dropdown' selected-languages=`${endpoints.interfacelanguages}1/` label-languages='' naked ) .dropdownWrapper - sib-display#mentor_account_picture.dropdownLabel( + solid-display#mentor_account_picture.dropdownLabel( bind-user nested-field="account" fields="foaf:depiction" @@ -27,13 +27,13 @@ div.dropdownPanel ul li - sib-link(next='mentor-dashboard') + solid-link(next='mentor-dashboard') p= data.Dashboard li - sib-link(next='mentor-database') + solid-link(next='mentor-database') p= data.ResourcesDatabase li - sib-link(next='mentor-account') + solid-link(next='mentor-account') p= data.MyAccount li a.logout-button diff --git a/src/includes/mentor/components/menu.pug b/src/includes/mentor/components/menu.pug index 860910eb24db0cf80c0fab3c479a72928d7c52d9..82013e8d607f0ddaedfc86856dec186cd0332671 100644 --- a/src/includes/mentor/components/menu.pug +++ b/src/includes/mentor/components/menu.pug @@ -1,12 +1,12 @@ -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-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) - sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-edit', use-id) - sib-route(name='resource-creation-confirmation') - sib-route(name='mentor-database') - sib-route(name='mentor-account-edit-confirmation') \ No newline at end of file +solid-router(default-route='mentor-resource-list' route-prefix=lang) + solid-route(name='mentor-resource-list') + solid-route(name='mentor-account', id-prefix=`${endpoints.users}`, use-id) + solid-route(name='mentor-account-edit', id-prefix=`${endpoints.users}`, use-id) + solid-route(id-prefix=`${endpoints.users}`, name='mentor-account-view', use-id) + solid-ac-checker(permission="acl:Write") + solid-route(name='mentor-resource-create') + solid-ac-checker(permission="acl:Write" bind-resources) + solid-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-edit', use-id) + solid-route(name='resource-creation-confirmation') + solid-route(name='mentor-database') + solid-route(name='mentor-account-edit-confirmation') \ No newline at end of file diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug index 341a3bbf1c6424d585e4a916f9319beeecf195fe..f750bac9153cea5a85557b68cecb449f865ac0de 100644 --- a/src/includes/mentor/dashboard.pug +++ b/src/includes/mentor/dashboard.pug @@ -15,11 +15,11 @@ section#home #mentor-resource-list(hidden).no-sidebar.container include resources/list.pug - sib-router - sib-ac-checker(permission="acl:Write" bind-resources) - sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-validate', use-id) - sib-route(name='resource-validation-process') - sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-detail', use-id) + solid-router + solid-ac-checker(permission="acl:Write" bind-resources) + solid-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-validate', use-id) + solid-route(name='resource-validation-process') + solid-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-detail', use-id) dialog(open)#mentor-resource-validate.no-sidebar include resources/validate.pug @@ -29,7 +29,7 @@ section#home dialog(open)#mentor-resource-detail.no-sidebar .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="mentor-dashboard") + solid-link(class="backlink", next="mentor-dashboard") .like p.backlink i.fas.fa-times @@ -44,7 +44,7 @@ section#home h2.title_form.related=`${data.RelatedResources}` - sib-display( + solid-display( bind-resources fields="related" multiple-related @@ -55,13 +55,13 @@ section#home #mentor-database(hidden).no-sidebar.container include resources/database.pug - sib-router - sib-ac-checker(permission="acl:Read" bind-resources) - sib-route(id-prefix=`${endpoints.resources}`, name='mentor-database-resource-detail', use-id) + solid-router + solid-ac-checker(permission="acl:Read" bind-resources) + solid-route(id-prefix=`${endpoints.resources}`, name='mentor-database-resource-detail', use-id) dialog(open)#mentor-database-resource-detail.no-sidebar .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="mentor-database") + solid-link(class="backlink", next="mentor-database") .like p.backlink i.fas.fa-times @@ -70,7 +70,7 @@ section#home h2.title_form.related=`${data.RelatedResources}` - sib-display( + solid-display( bind-resources fields="related" multiple-related @@ -79,11 +79,11 @@ section#home ) #mentor-resource-create(hidden).no-sidebar.container - sib-link(class="backlink", next="mentor-dashboard")=`${data.BackToDashboard}` + solid-link(class="backlink", next="mentor-dashboard")=`${data.BackToDashboard}` include resources/create.pug #mentor-resource-edit(hidden).no-sidebar.container - sib-link(class="backlink", next="mentor-dashboard")=`${data.BackToDashboard}` + solid-link(class="backlink", next="mentor-dashboard")=`${data.BackToDashboard}` include resources/edit.pug #resource-creation-confirmation(hidden).no-sidebar.container diff --git a/src/includes/mentor/profile/confirmation.pug b/src/includes/mentor/profile/confirmation.pug index 5dda249c3909ad3e83cd8493dcab0551f747e1ea..e8fe80b5d84432dfda473b491eb133f2c90eb8ad 100644 --- a/src/includes/mentor/profile/confirmation.pug +++ b/src/includes/mentor/profile/confirmation.pug @@ -6,4 +6,4 @@ p.p_entete= data.ModificationsProperlySaved div div.flex h3.button_base - sib-link(next='mentor-account')= data.BackToAccount \ No newline at end of file + solid-link(next='mentor-dashboard')=`${data.BackToAccount}` \ No newline at end of file diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug index 59470775c38f16bd85cd2dbc4bdd8e380f81de9b..6ee3cbf2f7ea841749f3f4ed691d2099f57500e2 100644 --- a/src/includes/mentor/profile/create.pug +++ b/src/includes/mentor/profile/create.pug @@ -8,7 +8,7 @@ figure.logo.img_log h2.title_create= data.CompleteContributorAccount -sib-form#mentor_profile_creation.block_log.block_creat_count( +solid-form#mentor_profile_creation.block_log.block_creat_count( bind-user partial fields="account_information(last_name, first_name, mentorProfile.organisation,\ @@ -45,21 +45,21 @@ sib-form#mentor_profile_creation.block_log.block_creat_count( label-mentorProfile.linkedin="Linkedin" label-mentorProfile.twitter="Twitter" - widget-mentorProfile.skills="sib-form-textarea" - widget-mentorProfile.biography="sib-form-textarea" - widget-username="sib-form-hidden" + widget-mentorProfile.skills="solid-form-textarea" + widget-mentorProfile.biography="solid-form-textarea" + widget-username="solid-form-hidden" class-mentorProfile.organisation='form-label is-dark' - widget-mentorProfile.organisation='sib-form-auto-completion' - widget-mentorProfile.country='sib-form-auto-completion' + widget-mentorProfile.organisation='solid-form-auto-completion' + widget-mentorProfile.country='solid-form-auto-completion' class-mentorProfile.languages='form-label is-dark' - multiple-mentorProfile.languages='sib-multiple-select' - widget-mentorProfile.languages='sib-form-auto-completion' + multiple-mentorProfile.languages='solid-multiple-select' + widget-mentorProfile.languages='solid-form-auto-completion' class-mentorProfile.fields='form-label is-dark' - multiple-mentorProfile.fields='sib-multiple-select' - widget-mentorProfile.fields='sib-form-auto-completion' + multiple-mentorProfile.fields='solid-multiple-select' + widget-mentorProfile.fields='solid-form-auto-completion' class-headline='w_75' diff --git a/src/includes/mentor/profile/detail.pug b/src/includes/mentor/profile/detail.pug index 77ef21209d25ccf6ef0a3d8e85f5132b6449dbe1..96950e5941f0610ecbdd043370fe7b2c6e6d7618 100644 --- a/src/includes/mentor/profile/detail.pug +++ b/src/includes/mentor/profile/detail.pug @@ -4,16 +4,16 @@ div.container_min div.block_list.flex div.button__actions.w_25 div.resources__newresource - sib-link(next='mentor-resource-create') + solid-link(next='mentor-resource-create') div div.button_base.ico_gauche.ico_plus=`${data.PostResource}` div.dashboard__database - sib-link(next='mentor-database') + solid-link(next='mentor-database') div.button_base.ico_gauche.ico_database=`${data.BrowseDatabase}` div.dashboard__database - sib-link(next='mentor-resource-list') + solid-link(next='mentor-resource-list') div.button_base.ico_gauche.ico_search=`${data.BackToDashboard}` div.dashboard__database @@ -22,10 +22,10 @@ div.block_list.flex )=`${data.Logout}` div.profile_information.block_log.w_75 - sib-link(next='mentor-account-edit') + solid-link(next='mentor-account-edit') button.button_edit <i class="fas fa-pen" aria-hidden="true"></i> - sib-display#mentor_info( + solid-display#mentor_info( bind-user fields='account.picture, name, username, mentorProfile.organisation.name, mentorProfile.headline, mentorProfile.city, mentorProfile.country.name, registered_on' widget-account.picture='cs-profile-picture' @@ -38,14 +38,14 @@ div.block_list.flex widget-mentorProfile.registered_on='cs-display-property' ) - sib-display.bold( + solid-display.bold( fields="" nested-field="resources" counter-template=`<p>\${counter} ${data.ResourcesUploadedHere}</p>` bind-user ) - sib-display#mentor_complementary( + solid-display#mentor_complementary( bind-user fields='biography_label, mentorProfile.biography, skills_label, mentorProfile.skills' widget-biography_label='cs-display-label' @@ -56,7 +56,7 @@ div.block_list.flex widget-mentorProfile.biography='cs-display-property' ) - sib-display#mentor_contact( + solid-display#mentor_contact( bind-user fields='email, mentorProfile.phone, mentorProfile.linkedin, mentorProfile.twitter' label-email=`${data.Email} : ` diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug index 0b00a15b4dcd8307d24b2fdc786a182ef70e1e97..d15c12048a2352cc2ae05a286cf4f99122c3f510 100644 --- a/src/includes/mentor/profile/edit.pug +++ b/src/includes/mentor/profile/edit.pug @@ -1,6 +1,6 @@ h2.title_create= data.EditYourAccount -sib-form#mentor_profile_edition.block_log.block_creat_count( +solid-form#mentor_profile_edition.block_log.block_creat_count( bind-user partial fields="account_information(last_name, first_name,\ @@ -33,27 +33,27 @@ sib-form#mentor_profile_edition.block_log.block_creat_count( label-mentorProfile.linkedin="Linkedin" label-mentorProfile.twitter="Twitter" - widget-mentorProfile.skills="sib-form-textarea" - widget-mentorProfile.biography="sib-form-textarea" - widget-username="sib-form-hidden" + widget-mentorProfile.skills="solid-form-textarea" + widget-mentorProfile.biography="solid-form-textarea" + widget-username="solid-form-hidden" class-mentorProfile.country='form-label is-dark' - widget-mentorProfile.country='sib-form-auto-completion' + widget-mentorProfile.country='solid-form-auto-completion' class-mentorProfile.languages='form-label is-dark' - multiple-mentorProfile.languages='sib-multiple-select' - widget-mentorProfile.languages='sib-form-auto-completion' + multiple-mentorProfile.languages='solid-multiple-select' + widget-mentorProfile.languages='solid-form-auto-completion' class-mentorProfile.fields='form-label is-dark' - multiple-mentorProfile.fields='sib-multiple-select' - widget-mentorProfile.fields='sib-form-auto-completion' + multiple-mentorProfile.fields='solid-multiple-select' + widget-mentorProfile.fields='solid-form-auto-completion' class-headline='w_75' submit-button=`${data.SaveModification}` next="mentor-account-edit-confirmation" ) -sib-form#mentor_profile_organisation.block_log.block_creat_count( +solid-form#mentor_profile_organisation.block_log.block_creat_count( partial bind-user nested-field="mentorProfile" @@ -62,21 +62,21 @@ sib-form#mentor_profile_organisation.block_log.block_creat_count( range-organisation=`${endpoints.organisations}` label-organisation=`${data.Organisation}` class-organisation='form-label is-dark input_big' - widget-organisation='sib-form-auto-completion' + widget-organisation='solid-form-auto-completion' submit-button=`${data.SaveModification}` next='mentor-account-edit-confirmation' ) -sib-form#mentor_profile_picture.block_log.block_creat_count( +solid-form#mentor_profile_picture.block_log.block_creat_count( partial bind-user nested-field="account" fields="profile_picture(picture, slug, issuer)" extra-context="{'picture':'foaf:depiction'}" - widget-issuer="sib-form-hidden" - widget-slug="sib-form-hidden" + widget-issuer="solid-form-hidden" + widget-slug="solid-form-hidden" upload-url-picture=`${sdn}upload/` widget-picture='cs-account-profile-picture' class-picture='input_photo w_25' @@ -85,5 +85,5 @@ sib-form#mentor_profile_picture.block_log.block_creat_count( next='mentor-account-edit-confirmation' ) -sib-link(class="backlink", next="mentor-account")= data.BackToMyAccount -sib-link(class="backlink", next="mentor-dashboard")= data.BackToDashboard +solid-link(class="backlink", next="mentor-account")= data.BackToMyAccount +solid-link(class="backlink", next="mentor-dashboard")= data.BackToDashboard diff --git a/src/includes/mentor/profile/view.pug b/src/includes/mentor/profile/view.pug index f8d5fd2bf1e59457bb79ae5d5f253400d68b965c..6cdf12e58b7290d506eded7a5d1696820ba75ed3 100644 --- a/src/includes/mentor/profile/view.pug +++ b/src/includes/mentor/profile/view.pug @@ -1,5 +1,5 @@ div.container_min - sib-display( + solid-display( bind-resources fields='name' widget-name='cs-display-page-title' @@ -8,11 +8,11 @@ div.container_min div.block_list.flex div.button__actions.w_25 div.dashboard__database - sib-link(next='mentor-database') + solid-link(next='mentor-database') div.button_base.ico_gauche.ico_database=`${data.BrowseDatabase}` div.profile_information.block_log - sib-display.user_info( + solid-display.user_info( bind-resources fields='account.picture, name, username, mentorProfile.headline, mentorProfile.city, mentorProfile.country.name, registered_on' widget-account.picture='cs-profile-picture' @@ -24,14 +24,14 @@ div.block_list.flex widget-mentorProfile.registered_on='cs-display-property' ) - sib-display.bold( + solid-display.bold( fields="" nested-field="resources" counter-template=`<p>\${counter} ${data.ResourcesUploadedHere}</p>` bind-resources ) - sib-display.user_complementary( + solid-display.user_complementary( bind-resources fields='biography_label, mentorProfile.biography, skills_label, mentorProfile.skills' widget-biography_label='cs-display-label' @@ -42,7 +42,7 @@ div.block_list.flex widget-mentorProfile.biography='cs-display-property' ) - sib-display.user_contact( + solid-display.user_contact( bind-resources fields='email, mentorProfile.phone, mentorProfile.linkedin, mentorProfile.twitter' label-email=`${data.Email} : ` diff --git a/src/includes/mentor/resources/comment.pug b/src/includes/mentor/resources/comment.pug index 89b51cbe52d86f9a07ccf032b93a4f3a25358358..65b4f41a6a258af3312e2f1bdf45e948e2863b6d 100644 --- a/src/includes/mentor/resources/comment.pug +++ b/src/includes/mentor/resources/comment.pug @@ -1,4 +1,4 @@ -sib-display#comment-detail( +solid-display#comment-detail( loader-id="detail-mentor-loader" bind-resources diff --git a/src/includes/mentor/resources/confirmation-deletion.pug b/src/includes/mentor/resources/confirmation-deletion.pug index 1665b198fe4814e50d42e9a85b1194fbab712611..4195e188676ea9f82f7404316670064f3705175d 100644 --- a/src/includes/mentor/resources/confirmation-deletion.pug +++ b/src/includes/mentor/resources/confirmation-deletion.pug @@ -1,12 +1,12 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="mentor-dashboard") + solid-link(class="backlink", next="mentor-dashboard") .like p i.fas.fa-times h2.title_lead_avenir=`${data.DeleteResource}` p=`${data.AreYouSureDelete}` - sib-delete( + solid-delete( data-label=`${data.YesSureDelete}` bind-resources ) diff --git a/src/includes/mentor/resources/confirmation-status-change.pug b/src/includes/mentor/resources/confirmation-status-change.pug index eccc4c4aac34eead678a03210900d50b58450f4d..b737f854b057c935f967873be81cb67dd01322ac 100644 --- a/src/includes/mentor/resources/confirmation-status-change.pug +++ b/src/includes/mentor/resources/confirmation-status-change.pug @@ -1,12 +1,12 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="mentor-resource-list") + solid-link(class="backlink", next="mentor-resource-list") .like p i.fas.fa-times h2.title_lead_avenir=`${data.AreYouSurArchive}` - sib-form#change_status_request( + solid-form#change_status_request( bind-resources fields='button(status, name, description, skills, reviewer)' value-status = "validated" diff --git a/src/includes/mentor/resources/confirmation.pug b/src/includes/mentor/resources/confirmation.pug index faa823230b7b16ab386ebf5cc838e83e2c49794f..e9af01b295357d5abcf3fd54f5e5be3268c118a6 100644 --- a/src/includes/mentor/resources/confirmation.pug +++ b/src/includes/mentor/resources/confirmation.pug @@ -1,8 +1,8 @@ div.container_min h2.title_lead.fd_bleu=`${data.GeneralLabel}` -sib-router - sib-route(name='resource-validation-process-confirmation') +solid-router + solid-route(name='resource-validation-process-confirmation') dialog(open)#resource-validation-process-confirmation.no-sidebar include ../validation-process.pug @@ -16,8 +16,8 @@ div.block_list div p.flex - sib-link(class="backlink pull-right", next="resource-validation-process-confirmation")=`${data.WhatValidationProcess}` + solid-link(class="backlink pull-right", next="resource-validation-process-confirmation")=`${data.WhatValidationProcess}` div.flex h3.button_base - sib-link(next='mentor-resource-list')=`${data.BackToDashboard}` \ No newline at end of file + solid-link(next='mentor-resource-list')=`${data.BackToDashboard}` \ No newline at end of file diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug index de920412bb54f662aa526d48b05f307b3ec5e22b..0356c38c1c5336cd449605200993ee97de32ffa9 100644 --- a/src/includes/mentor/resources/create.pug +++ b/src/includes/mentor/resources/create.pug @@ -3,7 +3,7 @@ h2.title_lead_avenir=`${data.PostResource}` p.p_entete=`${data.ThankYouEnrichingDatabase}` .block_log.block_creat_count - sib-form#resource_creation_form( + solid-form#resource_creation_form( data-src=`${endpoints.resources}` fields="mandatory_information(header_mandatory, name, country, languages, uri,\ format, fields, resource_author, publication_year, skills),\ @@ -58,36 +58,36 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}` label-sharing=`${data.ShareWithReq}` label-related=`${data.AddResource}` - multiple-fields='sib-multiple-select' - widget-fields='sib-form-auto-completion' + multiple-fields='solid-multiple-select' + widget-fields='solid-form-auto-completion' - multiple-type='sib-multiple-select' - widget-type='sib-form-auto-completion' + multiple-type='solid-multiple-select' + widget-type='solid-form-auto-completion' - widget-sharing='sib-form-auto-completion' - widget-target='sib-form-auto-completion' - widget-format='sib-form-auto-completion' + widget-sharing='solid-form-auto-completion' + widget-target='solid-form-auto-completion' + widget-format='solid-form-auto-completion' - multiple-steps='sib-multiple-select' - widget-steps='sib-form-auto-completion' + multiple-steps='solid-multiple-select' + widget-steps='solid-form-auto-completion' - multiple-languages='sib-multiple-select' - widget-languages='sib-form-auto-completion' + multiple-languages='solid-multiple-select' + widget-languages='solid-form-auto-completion' - multiple-related='sib-multiple-select' - widget-related='sib-form-auto-completion' + multiple-related='solid-multiple-select' + widget-related='solid-form-auto-completion' - multiple-skills='sib-multiple-select' - widget-skills='sib-form-auto-completion' + multiple-skills='solid-multiple-select' + widget-skills='solid-form-auto-completion' - widget-description='sib-form-textarea' - widget-publication_year='sib-form-number' - widget-country='sib-form-auto-completion' + widget-description='solid-form-textarea' + widget-publication_year='solid-form-number' + widget-country='solid-form-auto-completion' upload-url-preview_image=`${sdn}upload/` widget-preview_image='cs-form-file-custom' class-preview_image='input_photo w_25' - widget-iframe_link='sib-form-textarea' + widget-iframe_link='solid-form-textarea' submit-button=`${data.SendForValidation}` next="resource-creation-confirmation" diff --git a/src/includes/mentor/resources/database.pug b/src/includes/mentor/resources/database.pug index eb46b4069658d4c1e281048ab09667751e33568f..cc700501e7f283ab8bc3be97b1c2bd7ca9ca472f 100644 --- a/src/includes/mentor/resources/database.pug +++ b/src/includes/mentor/resources/database.pug @@ -6,13 +6,13 @@ div.container_min div.block_list div.button__actions div.resources__newresource - sib-link(next='mentor-resource-create') + solid-link(next='mentor-resource-create') div div.button_base.ico_gauche.ico_plus= `${data.PostResource}` div.dashboard__database - sib-link(next='mentor-resource-list') - div.button_base.ico_gauche.ico_database= `${data.BackToDashboard}` + solid-link(next='mentor-resource-list') + div.button_base.ico_gauche.ico_database=`${data.BackToDashboard } →` container.block_list.flex.flex_espace @@ -23,12 +23,12 @@ container.block_list.flex.flex_espace hidden i.fas.fa-spinner.fa-spin - sib-form.search-by-keyword( + solid-form.search-by-keyword( data-src=`${endpoints.resources}`, loader-id="resources-mentor-database-loader" fields='keyword(name_keyword)' label-name_keyword=`${data.SearchByNam}` - widget-name_keyword="sib-form-placeholder-text" + widget-name_keyword="solid-form-placeholder-text" naked ) @@ -36,7 +36,7 @@ container.block_list.flex.flex_espace div.keyword_submit.button__actions div.button_base.ico_gauche=`${data.Search}` - //- sib-form.instance_database_only( + //- solid-form.instance_database_only( //- data-src=`${endpoints.resources}`, //- fields='instance_database_only' //- widget-instance_database_only='cs-display-checkbox' @@ -44,7 +44,7 @@ container.block_list.flex.flex_espace //- naked //- ) - sib-form.more_criterias.flex.flex_espace( + solid-form.more_criterias.flex.flex_espace( data-src=`${endpoints.resources}`, fields='header_criterias, format, publication_year, country, languages, fields' label-header_criterias=`${data.MoreCriterias}` @@ -60,17 +60,17 @@ container.block_list.flex.flex_espace range-format=`${endpoints.formats}` range-country=`${endpoints.countries}` - multiple-country='sib-form-dropdown' - widget-country='sib-form-auto-completion' + multiple-country='solid-form-dropdown' + widget-country='solid-form-auto-completion' - multiple-languages='sib-form-dropdown' - widget-languages='sib-form-auto-completion' + multiple-languages='solid-form-dropdown' + widget-languages='solid-form-auto-completion' - multiple-format='sib-form-dropdown' - widget-format='sib-form-auto-completion' + multiple-format='solid-form-dropdown' + widget-format='solid-form-auto-completion' - multiple-fields='sib-form-dropdown' - widget-fields='sib-form-auto-completion' + multiple-fields='solid-form-dropdown' + widget-fields='solid-form-auto-completion' naked ) @@ -79,14 +79,14 @@ container.block_list.flex.flex_espace //Fake tabs to filter by type. div.tabs.flex_espace div(class='tablink filter_by_type active', onclick="openFakeTab(this)") - sib-display.type1( + solid-display.type1( data-src=`${endpoints.types}1/` fields='name' widget-name='fake-tabs' ) div(class='tablink filter_by_type', onclick="openFakeTab(this)") - sib-display#type2( + solid-display#type2( data-src=`${endpoints.types}2/` fields='name' widget-name='fake-tabs' @@ -99,7 +99,7 @@ container.block_list.flex.flex_espace div#resources-loader-step1-browse-database hidden i.fas.fa-spinner.fa-spin - sib-display( + solid-display( loader-id="resources-loader-step1-browse-database" data-src=`${endpoints.steps}1/`, fields='name' @@ -111,7 +111,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step1}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -123,16 +123,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' @@ -149,7 +149,7 @@ container.block_list.flex.flex_espace //Step 2 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}2/`, fields='name' class="accordion active" @@ -160,7 +160,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step2}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -172,16 +172,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' @@ -198,7 +198,7 @@ container.block_list.flex.flex_espace //Step 3 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}3/`, fields='name' class="accordion active" @@ -210,7 +210,7 @@ container.block_list.flex.flex_espace ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step3}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -222,16 +222,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -247,7 +247,7 @@ container.block_list.flex.flex_espace //Step 4 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}4/`, fields='name' class="accordion active" @@ -259,7 +259,7 @@ container.block_list.flex.flex_espace ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step4}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -271,16 +271,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -296,7 +296,7 @@ container.block_list.flex.flex_espace //Step 5 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}5/`, fields='name' class="accordion active" @@ -307,7 +307,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step5}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -319,16 +319,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -344,7 +344,7 @@ container.block_list.flex.flex_espace //Step 6 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}6/`, fields='name' class="accordion active" @@ -355,7 +355,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step6}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -367,16 +367,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug index 12afea918c6eeedbd83b80526438eaeb751b2077..dcae6ee778268c52dd65d08f1022e403653dec16 100644 --- a/src/includes/mentor/resources/detail.pug +++ b/src/includes/mentor/resources/detail.pug @@ -1,4 +1,4 @@ -sib-display#detail-mentor( +solid-display#detail-mentor( loader-id="detail-mentor-loader" bind-resources, fields='name, steps, format.name,\ @@ -77,14 +77,14 @@ sib-display#detail-mentor( //- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p> //- </div> -//- sib-display( +//- solid-display( //- bind-resources //- fields="" //- nested-field="likes" //- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>" //- ) -//- sib-display( +//- solid-display( //- bind-resources //- fields="" //- nested-field="dislikes" @@ -92,13 +92,13 @@ sib-display#detail-mentor( //- ) p.share SHARE : - sib-display.email-link( + solid-display.email-link( bind-resources fields="@id" widget-id='cs-display-email-button' ) - sib-display.twitter-link( + solid-display.twitter-link( bind-resources fields="@id" widget-id='cs-display-twitter-button' diff --git a/src/includes/mentor/resources/edit.pug b/src/includes/mentor/resources/edit.pug index f92c15458f31658fee275cf7c485c6ff1aa86fe2..77b05aa328f866320cdc9f72e0ef4e15d4cf7fe0 100644 --- a/src/includes/mentor/resources/edit.pug +++ b/src/includes/mentor/resources/edit.pug @@ -3,7 +3,7 @@ h2.title_lead_avenir=`${data.EditResource}` p.p_entete=`${data.ThankYouEnrichingDatabase}` .block_log.block_creat_count - sib-form#resource_edition_form( + solid-form#resource_edition_form( bind-resources partial fields="mandatory_information(header_mandatory, name, country, languages, uri,\ @@ -17,7 +17,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}` widget-header_classification='cs-section_header' widget-header_access='cs-section_header' widget-header_related='cs-section_header' - widget-iframe_link='sib-form-textarea' + widget-iframe_link='solid-form-textarea' range-type=`${endpoints.types}` range-format=`${endpoints.formats}` @@ -56,32 +56,32 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}` label-related=`${data.AddResource}` - widget-country='sib-form-auto-completion' - widget-sharing='sib-form-auto-completion' - widget-target='sib-form-auto-completion' + widget-country='solid-form-auto-completion' + widget-sharing='solid-form-auto-completion' + widget-target='solid-form-auto-completion' - multiple-fields='sib-multiple-select' - widget-fields='sib-form-auto-completion' + multiple-fields='solid-multiple-select' + widget-fields='solid-form-auto-completion' - multiple-type='sib-multiple-select' - widget-type='sib-form-auto-completion' + multiple-type='solid-multiple-select' + widget-type='solid-form-auto-completion' - widget-format='sib-form-auto-completion' + widget-format='solid-form-auto-completion' - multiple-steps='sib-multiple-select' - widget-steps='sib-form-auto-completion' + multiple-steps='solid-multiple-select' + widget-steps='solid-form-auto-completion' - multiple-languages='sib-multiple-select' - widget-languages='sib-form-auto-completion' + multiple-languages='solid-multiple-select' + widget-languages='solid-form-auto-completion' - multiple-related='sib-multiple-select' - widget-related='sib-form-auto-completion' + multiple-related='solid-multiple-select' + widget-related='solid-form-auto-completion' - multiple-skills='sib-multiple-select' - widget-skills='sib-form-auto-completion' + multiple-skills='solid-multiple-select' + widget-skills='solid-form-auto-completion' - widget-description='sib-form-textarea' - widget-publication_year='sib-form-number' + widget-description='solid-form-textarea' + widget-publication_year='solid-form-number' upload-url-preview_image=`${sdn}upload/` widget-preview_image='cs-form-file-custom' diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug index 7c4555592d316475c712f5e47fea45d8516f3b70..28cae177e122adaef490d91d32bebb5cd063beae 100644 --- a/src/includes/mentor/resources/list.pug +++ b/src/includes/mentor/resources/list.pug @@ -1,7 +1,7 @@ -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) +solid-router + solid-route( name='confirm_suppress', use-id) + solid-route( name='resource-report-broken-link-mentor', use-id) + solid-route( name='confirm_status_change', id-prefix=`${endpoints.requests}`, use-id) dialog(open)#confirm_suppress.no-sidebar include ./confirmation-deletion @@ -20,12 +20,12 @@ div.container_min div.block_list div.button__actions div.resources__newresource - sib-link(next='mentor-resource-create') + solid-link(next='mentor-resource-create') div div.button_base.ico_gauche.ico_plus=`${data.PostResource}` div.dashboard__database - sib-link(next='mentor-database') + solid-link(next='mentor-database') div.button_base.ico_gauche.ico_database=`${data.BrowseDatabase}` div.tabs @@ -42,8 +42,8 @@ div.block_list div#loader-review-mentor hidden i.fas.fa-spinner.fa-spin - sib-link(class="backlink pull-right", next="resource-validation-process")=`${data.WhatValidationProcess}` - sib-display#pending_resources( + solid-link(class="backlink pull-right", next="resource-validation-process")=`${data.WhatValidationProcess}` + solid-display#pending_resources( loader-id="loader-review-mentor" data-src=`${endpoints.resources}pending/` fields='content(name, info(resource_author, publication_year)), validate', @@ -68,7 +68,7 @@ div.block_list div p=`${data.RequestIntro}` - sib-display#request_list.request_accordion( + solid-display#request_list.request_accordion( loader-id="loader-requests-mentor" data-src=`${endpoints.requests}` fields='name, content(description, info(fields, language.name, target, submitter.email, status))', @@ -101,7 +101,7 @@ div.block_list hidden i.fas.fa-spinner.fa-spin - sib-display#resources_history( + solid-display#resources_history( loader-id="loader-history-mentor" bind-user nested-field='resources' @@ -114,18 +114,18 @@ div.block_list search-range-country=`${endpoints.countries}` search-label-search_for_a_resource=`${data.SearchByNam}` - search-widget-search_for_a_resource="sib-form-placeholder-text" + search-widget-search_for_a_resource="solid-form-placeholder-text" widget-search_for_a_resource="hidden-widget" - search-multiple-format='sib-form-dropdown' - search-widget-format='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='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' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' widget-review.status='cs-resource-status', search-widget-header_criterias="cs-section_header" diff --git a/src/includes/mentor/resources/resource-report-broken-link-mentor.pug b/src/includes/mentor/resources/resource-report-broken-link-mentor.pug index b41423b95f7e480e266b10e2d7a900e5fe75322e..047f16508ba6d54a01a38382dec7bf4a816683fa 100644 --- a/src/includes/mentor/resources/resource-report-broken-link-mentor.pug +++ b/src/includes/mentor/resources/resource-report-broken-link-mentor.pug @@ -1,16 +1,16 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="mentor-resource-list") + solid-link(class="backlink", next="mentor-resource-list") .like p i.fas.fa-times h2.title_lead_avenir=`${data.Thanks}` p=`${data.ConfirmSendBrokenLink}` - sib-form#report-broken-link-mentor( + solid-form#report-broken-link-mentor( data-src=`${endpoints.brokenlinks}` fields = "resource, submitter" - widget-resource='sib-form-hidden' - widget-submitter='sib-form-hidden' + widget-resource='solid-form-hidden' + widget-submitter='solid-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 b9e9963145d9d52e58f9b71e21002090a0748fb3..e9fc20d4960ea94089e00e8063db97d2ff789335 100644 --- a/src/includes/mentor/resources/validate.pug +++ b/src/includes/mentor/resources/validate.pug @@ -1,10 +1,10 @@ -sib-router - sib-route(name='improvement-dialog') - sib-route(name='refusal-dialog') - sib-route(name='review-submission-confirmation') +solid-router + solid-route(name='improvement-dialog') + solid-route(name='refusal-dialog') + solid-route(name='review-submission-confirmation') .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="mentor-dashboard") + solid-link(class="backlink", next="mentor-dashboard") .like p.backlink i.fas.fa-times @@ -13,7 +13,7 @@ sib-router hidden i.fas.fa-spinner.fa-spin - sib-display#resource-to-validate( + solid-display#resource-to-validate( loader-id="detail-validation-loader" bind-resources, fields='name, steps, format.name,\ @@ -78,33 +78,33 @@ sib-router ) p.p_entete - sib-display.action_button( + solid-display.action_button( bind-resources fields='improve' - widget-improve='sib-action' + widget-improve='solid-action' label-improve=`${data.RequireImprovement}` action-improve='improvement-dialog' class-improve='button_base' ) p.p_entete - sib-display.action_button( + solid-display.action_button( bind-resources fields='refuse' - widget-refuse='sib-action' + widget-refuse='solid-action' label-refuse=`${data.ReportInappropriate}` action-refuse='refusal-dialog' class-refuse='button_base' ) - sib-form#validation_form.action_button( + solid-form#validation_form.action_button( bind-resources nested-field='review' fields='status, reviewer', - widget-reviewer='sib-form-hidden' - widget-status='sib-form-hidden' + widget-reviewer='solid-form-hidden' + widget-status='solid-form-hidden' value-status='validated' submit-button=`${data.Validate}` next='review-submission-confirmation' @@ -112,20 +112,20 @@ sib-router dialog(open)#refusal-dialog.no-sidebar div.block_log.block_dialog.no_shadow - sib-link(class="backlink", next="mentor-dashboard") + solid-link(class="backlink", next="mentor-dashboard") .like p i.fas.fa-times h2.title_lead=`${data.ReportInappropriate}` - sib-form#refusal_dialog_form( + solid-form#refusal_dialog_form( bind-resources nested-field='review' fields='comment, status, reviewer', label-comment=`${data.ExplainReasonsRefusal}` - widget-comment='sib-form-textarea' - widget-reviewer='sib-form-hidden' - widget-status='sib-form-hidden' + widget-comment='solid-form-textarea' + widget-reviewer='solid-form-hidden' + widget-status='solid-form-hidden' value-status='inappropriate' submit-button=`${data.Send}` next='review-submission-confirmation' @@ -133,20 +133,20 @@ sib-router dialog(open)#improvement-dialog.no-sidebar div.block_log.block_dialog.no_shadow - sib-link(class="backlink", next="mentor-dashboard") + solid-link(class="backlink", next="mentor-dashboard") .like p i.fas.fa-times h2.title_lead=`${data.SuggestImprovement}` - sib-form#improvement_dialog_form( + solid-form#improvement_dialog_form( bind-resources nested-field='review' fields='comment, status, reviewer', label-comment=`${data.ExplainImprovementRequired}` - widget-reviewer='sib-form-hidden' - widget-comment='sib-form-textarea' - widget-status='sib-form-hidden' + widget-reviewer='solid-form-hidden' + widget-comment='solid-form-textarea' + widget-status='solid-form-hidden' value-status='to_improve' submit-button=`${data.Send}` next='review-submission-confirmation' @@ -154,7 +154,7 @@ sib-router dialog(open)#review-submission-confirmation.no-sidebar div.block_log.block_dialog.no_shadow - sib-link(class="backlink", next="mentor-dashboard") + solid-link(class="backlink", next="mentor-dashboard") .like p i.fas.fa-times @@ -162,4 +162,4 @@ sib-router p.flex=`${data.SubmitterWillReceiveReview}` p.flex=`${data.HeWillPatch}` p.flex - sib-link(next='mentor-dashboard', class='button_base')=`${data.BackToDashboard}` \ No newline at end of file + solid-link(next='mentor-dashboard', class='button_base')=`${data.BackToDashboard}` \ No newline at end of file diff --git a/src/includes/mentor/validation-process.pug b/src/includes/mentor/validation-process.pug index 6e8fe997a652a5e0ea72f4922d73a032e7348a75..3f68cf1c54bf29ddc73580db9a985163890feab1 100644 --- a/src/includes/mentor/validation-process.pug +++ b/src/includes/mentor/validation-process.pug @@ -1,5 +1,5 @@ div.block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="mentor-resource-list") + solid-link(class="backlink", next="mentor-resource-list") i.fas.fa-times div#validation-process h2=`${data.WhatValidationProcess}` diff --git a/src/includes/public/components/header.pug b/src/includes/public/components/header.pug index 249dbc4ec59fcfad704c26a0e654931a2ff5acec..6900f217f7e39ff70b89d6bd49ff5a2d5fdbd4f3 100644 --- a/src/includes/public/components/header.pug +++ b/src/includes/public/components/header.pug @@ -1,17 +1,17 @@ .container .flex.flex_espace.flex_item_center - sib-link(next='public-resource-list') + solid-link(next='public-resource-list') figure.logo_head.margin_bord_ecran img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter") include menu.pug div.flex.flex_espace.flex_item_center - sib-form.languageChoice( + solid-form.languageChoice( data-src=`${endpoints.interfacelanguages}` fields='languages' range-languages=`${endpoints.interfacelanguages}` - widget-languages='sib-form-dropdown' + widget-languages='solid-form-dropdown' selected-languages=`${endpoints.interfacelanguages}1/` label-languages='' naked diff --git a/src/includes/public/components/menu.pug b/src/includes/public/components/menu.pug index e925ec37a251a58cf97cd50d1cdc0e6d70c4a73a..1adbf1aef2f159e71fac7182f8f21578846e97ca 100644 --- a/src/includes/public/components/menu.pug +++ b/src/includes/public/components/menu.pug @@ -1,5 +1,5 @@ -sib-router(default-route='public-resource-list') - sib-route(name='public-resource-list') - sib-ac-checker(permission="acl:Read" bind-resources) - sib-route(id-prefix=`${endpoints.users}`, name='user-account-view', use-id) +solid-router(default-route='public-resource-list') + solid-route(name='public-resource-list') + solid-ac-checker(permission="acl:Read" bind-resources) + solid-route(id-prefix=`${endpoints.users}`, name='user-account-view', use-id) \ No newline at end of file diff --git a/src/includes/public/dashboard.pug b/src/includes/public/dashboard.pug index f968cfe5e2d617bc9a449bc1cb0ab3696d0497a3..91a8cee82dd4112567544362a84ec09cede78194 100644 --- a/src/includes/public/dashboard.pug +++ b/src/includes/public/dashboard.pug @@ -11,8 +11,8 @@ section#home #public-resource-list.no-sidebar.container include ./resources/list.pug - sib-router - sib-route(id-prefix=`${endpoints.resources}`, name='public-resource-detail', use-id) + solid-router + solid-route(id-prefix=`${endpoints.resources}`, name='public-resource-detail', use-id) dialog(open)#public-resource-detail.no-sidebar include resources/detail.pug diff --git a/src/includes/public/profile/view.pug b/src/includes/public/profile/view.pug index 03bb1b32963c23c6231599e57b459bed0eba6762..57224a6dc5349fbc95784adedd68ede8f96233ce 100644 --- a/src/includes/public/profile/view.pug +++ b/src/includes/public/profile/view.pug @@ -1,5 +1,5 @@ div.container_min - sib-display( + solid-display( bind-resources fields='name' widget-name='cs-display-page-title' @@ -8,11 +8,11 @@ div.container_min div.block_list.flex div.button__actions.w_25 div.dashboard__database - sib-link(next='public-resource-list') + solid-link(next='public-resource-list') div.button_base.ico_gauche.ico_database=`${data.BrowseDatabase}` div.profile_information.block_log - sib-display.user_info( + solid-display.user_info( bind-resources fields='account.picture, name, username, mentorProfile.headline, mentorProfile.city, mentorProfile.country.name, registered_on' widget-account.picture='cs-profile-picture' @@ -24,14 +24,14 @@ div.block_list.flex widget-mentorProfile.registered_on='cs-display-property' ) - sib-display.bold( + solid-display.bold( fields="" nested-field="resources" counter-template=`<p>\${counter} ${data.ResourcesUploadedHere}</p>` bind-resources ) - sib-display.user_complementary( + solid-display.user_complementary( bind-resources fields='biography_label, mentorProfile.biography, skills_label, mentorProfile.skills' widget-biography_label='cs-display-label' @@ -42,7 +42,7 @@ div.block_list.flex widget-mentorProfile.biography='cs-display-property' ) - sib-display.user_contact( + solid-display.user_contact( bind-resources fields='email, mentorProfile.phone, mentorProfile.linkedin, mentorProfile.twitter' label-email=`${data.Email} : ` diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug index 10793e3fb2167bb2e14df6b344cad460d42f1272..b0139db60f9b26d088a12fd1ecc0f6344c0f108f 100644 --- a/src/includes/public/resources/detail.pug +++ b/src/includes/public/resources/detail.pug @@ -1,5 +1,5 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="public-dashboard") + solid-link(class="backlink", next="public-dashboard") .like p.backlink i.fas.fa-times @@ -8,7 +8,7 @@ hidden i.fas.fa-spinner.fa-spin - sib-display#detail-public( + solid-display#detail-public( loader-id="detail-public-loader" bind-resources, fields='name, steps, format.name,\ @@ -87,14 +87,14 @@ //- <p class="backlink"><i class='far fa-thumbs-down'></i>3</p> //- </div> - //- sib-display( + //- solid-display( //- bind-resources //- fields="" //- nested-field="likes" //- counter-template="<p><i class='fas fa-thumbs-up'></i>${counter}</p>" //- ) - //- sib-display( + //- solid-display( //- bind-resources //- fields="" //- nested-field="dislikes" @@ -103,19 +103,19 @@ p.share SHARE : - sib-display.email-link( + solid-display.email-link( bind-resources fields="@id" widget-id = 'cs-display-email-button' ) - sib-display.twitter-link( + solid-display.twitter-link( bind-resources fields="@id" widget-id = 'cs-display-twitter-button' ) - sib-display( + solid-display( bind-resources fields="" nested-field="conversations" @@ -125,13 +125,14 @@ sib-conversation( bind-resources nested-field="conversations" - comment-input-label-text="Add a comment" - send-button-text="Send" + comment-input-label-text=`${data.AddAComment}` + send-button-text=`${data.Send}` + comment-input-placeholder-text=`${data.YourMessageHere}` ) h2.title_form.related=`${data.RelatedResources}` - sib-display( + solid-display( bind-resources fields="related" multiple-related diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug index 75b9d14c4ca3ed4e0940482381fc003f790ace40..c38826f4e1749d7bbff9609a5edd9d356d20e598 100644 --- a/src/includes/public/resources/list.pug +++ b/src/includes/public/resources/list.pug @@ -1,5 +1,5 @@ -sib-router - sib-route( name='resource-report-broken-link-public', use-id) +solid-router + solid-route( name='resource-report-broken-link-public', use-id) dialog(open)#resource-report-broken-link-public include ./resource-report-broken-link-public @@ -16,12 +16,12 @@ container.block_list.flex.flex_espace div#public-resources-loader hidden i.fas.fa-spinner.fa-spin - sib-form.search-by-keyword( + solid-form.search-by-keyword( data-src=`${endpoints.resources}`, loader-id="public-resources-loader" fields='keyword(name_keyword)' label-name_keyword=`${data.SearchByNam}` - widget-name_keyword="sib-form-placeholder-text" + widget-name_keyword="solid-form-placeholder-text" naked ) @@ -29,7 +29,7 @@ container.block_list.flex.flex_espace div.keyword_submit.button__actions div.button_base.ico_gauche=`${data.Search}` - //- sib-form.instance_database_only( + //- solid-form.instance_database_only( //- data-src=`${endpoints.resources}`, //- fields='instance_database_only' //- widget-instance_database_only='cs-display-checkbox' @@ -37,7 +37,7 @@ container.block_list.flex.flex_espace //- naked //- ) - sib-form.more_criterias.flex.flex_espace( + solid-form.more_criterias.flex.flex_espace( data-src=`${endpoints.resources}`, fields='header_criterias, format, publication_year, country, languages, fields' label-header_criterias=`${data.Search}` @@ -53,17 +53,17 @@ container.block_list.flex.flex_espace range-format=`${endpoints.formats}` range-country=`${endpoints.countries}` - multiple-languages='sib-form-dropdown' - widget-languages='sib-form-auto-completion' + multiple-languages='solid-form-dropdown' + widget-languages='solid-form-auto-completion' - multiple-format='sib-form-dropdown' - widget-format='sib-form-auto-completion' + multiple-format='solid-form-dropdown' + widget-format='solid-form-auto-completion' - multiple-fields='sib-form-dropdown' - widget-fields='sib-form-auto-completion' + multiple-fields='solid-form-dropdown' + widget-fields='solid-form-auto-completion' - multiple-country='sib-form-dropdown' - widget-country='sib-form-auto-completion' + multiple-country='solid-form-dropdown' + widget-country='solid-form-auto-completion' naked ) @@ -72,14 +72,14 @@ container.block_list.flex.flex_espace //Fake tabs to filter by type. div.tabs.flex_espace div(class='tablink filter_by_type active', onclick="openFakeTab(this)") - sib-display.type1( + solid-display.type1( data-src=`${endpoints.types}1/` fields='name' widget-name='fake-tabs' ) div(class='tablink filter_by_type', onclick="openFakeTab(this)") - sib-display#type2( + solid-display#type2( data-src=`${endpoints.types}2/` fields='name' widget-name='fake-tabs' @@ -92,7 +92,7 @@ container.block_list.flex.flex_espace div#resources-loader-step1-public hidden i.fas.fa-spinner.fa-spin - sib-display( + solid-display( loader-id="resources-loader-step1-public" data-src=`${endpoints.steps}1/`, fields='name' @@ -104,7 +104,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step1}`, fields='name, resource_author, format.name, publication_year, description', search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)', @@ -116,15 +116,15 @@ container.block_list.flex.flex_espace search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" - search-multiple-format='sib-form-dropdown' - search-widget-format='sib-form-auto-completion' - search-multiple-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' - search-multiple-type='sib-form-dropdown' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' + search-multiple-type='solid-form-dropdown' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -141,7 +141,7 @@ container.block_list.flex.flex_espace //Step 2 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}2/`, fields='name' class="accordion active" @@ -152,7 +152,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step2}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -164,16 +164,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -190,7 +190,7 @@ container.block_list.flex.flex_espace //Step 3 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}3/`, fields='name' class="accordion active" @@ -202,7 +202,7 @@ container.block_list.flex.flex_espace ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step3}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -214,16 +214,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -239,7 +239,7 @@ container.block_list.flex.flex_espace //Step 4 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}4/`, fields='name' class="accordion active" @@ -251,7 +251,7 @@ container.block_list.flex.flex_espace ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step4}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -263,16 +263,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' @@ -289,7 +289,7 @@ container.block_list.flex.flex_espace //Step 5 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}5/`, fields='name' class="accordion active" @@ -300,7 +300,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step5}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -312,16 +312,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' @@ -338,7 +338,7 @@ container.block_list.flex.flex_espace ) //Step 6 div.step - sib-display( + solid-display( data-src=`${endpoints.steps}6/`, fields='name' class="accordion active" @@ -349,7 +349,7 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - sib-display.resource_by_step( + solid-display.resource_by_step( data-src=`${endpoints.step6}` fields='name, resource_author, format.name, publication_year, description' search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, languages, fields, type)' @@ -361,16 +361,16 @@ container.block_list.flex.flex_espace 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-country='sib-form-dropdown' - search-widget-country='sib-form-auto-completion' - search-multiple-languages='sib-form-dropdown' - search-widget-languages='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' + search-multiple-type='solid-form-dropdown' + search-widget-type='solid-form-auto-completion' + search-multiple-format='solid-form-dropdown' + search-widget-format='solid-form-auto-completion' + search-multiple-country='solid-form-dropdown' + search-widget-country='solid-form-auto-completion' + search-multiple-languages='solid-form-dropdown' + search-widget-languages='solid-form-auto-completion' + search-multiple-fields='solid-form-dropdown' + search-widget-fields='solid-form-auto-completion' widget-name='cs-display-property' widget-publication_year='cs-display-property' diff --git a/src/includes/public/resources/resource-report-broken-link-public.pug b/src/includes/public/resources/resource-report-broken-link-public.pug index 8b7f94fb8511fec0f94807473abd88c91c03c8cd..bff6e0e38cca17145bb10c317a46c2a5fa617c8b 100644 --- a/src/includes/public/resources/resource-report-broken-link-public.pug +++ b/src/includes/public/resources/resource-report-broken-link-public.pug @@ -1,16 +1,16 @@ .block_log.block_creat_count.no_shadow - sib-link(class="backlink", next="public-resource-list") + solid-link(class="backlink", next="public-resource-list") .like p i.fas.fa-times h2.title_lead_avenir=`${data.Thanks}` p=`${data.ConfirmSendBrokenLink}` - sib-form#report-broken-link-public( + solid-form#report-broken-link-public( data-src=`${endpoints.brokenlinks}` fields = "resource, submitter" - widget-resource='sib-form-hidden' - widget-submitter='sib-form-hidden' + widget-resource='solid-form-hidden' + widget-submitter='solid-form-hidden' submit-button='ok' next="public-resource-list" ) \ No newline at end of file diff --git a/src/includes/splash.pug b/src/includes/splash.pug index c16ac092f9a47ba3341e10b1cb803712c3073e55..944aca57c637e8e79928e3efd80b1eebaa10a2f2 100644 --- a/src/includes/splash.pug +++ b/src/includes/splash.pug @@ -1,5 +1,5 @@ -sib-router(default-route='splash-index') - sib-route(name='splash-index') +solid-router(default-route='splash-index') + solid-route(name='splash-index') figure(class="logo") img(src=`${client_domain}/images/logo.png` alt="Coopstarter logo") @@ -14,7 +14,7 @@ h2.title_lead=`${data.Welcome}` cs-login(bind-user) button#kldb_login.button_base=`${data.ConnectKnowledgeBase}` - sib-link(next='public-dashboard') + solid-link(next='public-dashboard') button#public-access.button_base=`${data.AccessWithoutRegistration}` \ No newline at end of file diff --git a/src/index.pug b/src/index.pug index cd04c311f9401d5aa85b83e583de6388790ee4b2..d0028a8c228dd15b3ca0c4c6d060dea7e80dacb3 100644 --- a/src/index.pug +++ b/src/index.pug @@ -38,4 +38,22 @@ html script(type='module' src='/scripts/dispatch-space-n-user.js') + kb-reactivity(bind-user nested-field="account" target-src=`${endpoints.accounts || endpoints.get.accounts}`) + kb-reactivity(bind-user nested-field="mentor_profile" target-src=`${endpoints.mentors || endpoints.get.mentors}`) + kb-reactivity(bind-user nested-field="entrepreneur_profile" target-src=`${endpoints.entrepreneurs || endpoints.get.entrepreneurs}`) + kb-reactivity(bind-user target-src=`${endpoints.mentors || endpoints.get.mentors}`) + kb-reactivity(bind-user target-src=`${endpoints.accounts || endpoints.get.accounts}`) + kb-reactivity(bind-user nested-field="mentor_profile" target-src=`${endpoints.fields || endpoints.get.fields}`) + kb-reactivity(bind-user nested-field="mentor_profile" target-src=`${endpoints.languages || endpoints.get.languages}`) + kb-reactivity(bind-user target-src=`${endpoints.entrepreneurs || endpoints.get.entrepreneurs}`) + + kb-reactivity(bind-user nested-field="resources" target-src=`${endpoints.resources || endpoints.get.resources}`) + kb-reactivity(data-src=`${endpoints.resources || endpoints.get.resources}pending/` target-src=`${endpoints.step1 || endpoints.get.step1}`) + kb-reactivity(data-src=`${endpoints.resources || endpoints.get.resources}pending/` target-src=`${endpoints.step2 || endpoints.get.step2}`) + kb-reactivity(data-src=`${endpoints.resources || endpoints.get.resources}pending/` target-src=`${endpoints.step3 || endpoints.get.step3}`) + kb-reactivity(data-src=`${endpoints.resources || endpoints.get.resources}pending/` target-src=`${endpoints.step4 || endpoints.get.step4}`) + kb-reactivity(data-src=`${endpoints.resources || endpoints.get.resources}pending/` target-src=`${endpoints.step5 || endpoints.get.step5}`) + kb-reactivity(data-src=`${endpoints.resources || endpoints.get.resources}pending/` target-src=`${endpoints.step6 || endpoints.get.step6}`) + kb-reactivity(data-src=`${endpoints.resources || endpoints.get.resources}pending/` target-src=`${endpoints.step6 || endpoints.get.step6}`) + diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js index 7714adb846bb22cef54a349066e9eca710972685..7723f75fc7bfdee1c56bb6aebb394ae525af49ba 100644 --- a/src/scripts/coopstarter.js +++ b/src/scripts/coopstarter.js @@ -117,6 +117,7 @@ async function refreshList(formId, listId) { */ async function refreshUser(formId, listId) { let form = document.getElementById(formId); + form.addEventListener("save", async function() { var list = document.getElementById(listId); @@ -161,7 +162,7 @@ async function refreshUser(formId, listId) { */ function refreshPagination() { var resources_containers = document.querySelectorAll( - ".resource_by_step sib-form+div" + ".resource_by_step solid-form+div" ); for (let resources_container of resources_containers) { @@ -205,7 +206,7 @@ function selectHiddenManagement(select_hidden, option_selected) { } //Trigerring a reload of the associated form - let parent_form = select_hidden.closest("sib-form"); + let parent_form = select_hidden.closest("solid-form"); parent_form.component.inputChange(); parent_form.dispatchEvent(new CustomEvent('formChange')); refreshPagination(); @@ -218,7 +219,7 @@ function selectHiddenManagement(select_hidden, option_selected) { */ function inputHiddenManagement(field, field_search) { field.setAttribute("value", field_search.value); - let parent_form = field.closest("sib-form"); + let parent_form = field.closest("solid-form"); parent_form.component.inputChange(); parent_form.dispatchEvent(new CustomEvent('formChange')); refreshPagination(); @@ -237,7 +238,7 @@ function selectHiddenManagementForType(tab, form) { if (tab.classList.contains("active")) { //Fullfill hidden field let type_field_search = tab - .querySelector(`sib-display`) + .querySelector(`solid-display`) .getAttribute("data-src"); type_hidden_field.forEach(function(select_hidden) { @@ -254,7 +255,7 @@ function selectHiddenManagementForType(tab, form) { } //Trigerring a reload of the associated form - let parent_form = select_hidden.closest("sib-form"); + let parent_form = select_hidden.closest("solid-form"); if (parent_form) { parent_form.component.inputChange(); parent_form.dispatchEvent(new CustomEvent('formChange')); @@ -289,7 +290,7 @@ function InitManagementForType() { } //Trigerring a reload of the associated form - let parent_form = select_hidden.closest("sib-form"); + let parent_form = select_hidden.closest("solid-form"); parent_form.component.inputChange(); parent_form.dispatchEvent(new CustomEvent('formChange')); refreshPagination(); @@ -325,7 +326,7 @@ function manageAccordionByStep(){ this.classList.remove("active"); this.nextElementSibling.querySelector( - "sib-form + div" + "solid-form + div" ).style.maxHeight = "0px"; } else { this.classList.add("active"); @@ -336,7 +337,7 @@ function manageAccordionByStep(){ .removeAttribute("hidden"); refreshPagination(); - var panel = this.nextElementSibling.querySelector("sib-form + div"); + var panel = this.nextElementSibling.querySelector("solid-form + div"); if (panel.style.maxHeight) { panel.style.maxHeight = null; @@ -459,10 +460,10 @@ function initFileUpload(elementId, inputName, fileUploadLabel) { const parentForm = document.getElementById(elementId); parentForm.addEventListener("populate", e => { var previewImage = e.target.querySelectorAll( - `sib-form-file input[name='${inputName}']+input` + `solid-form-file input[name='${inputName}']+input` ); - var previewlabel = e.target.querySelectorAll("sib-form-file div label"); + var previewlabel = e.target.querySelectorAll("solid-form-file div label"); for (let item of previewlabel) { item.innerHTML = fileUploadLabel; } @@ -538,7 +539,7 @@ function addEventListenersToSearchFormFields(baseElement, filterForm, fieldName) /** * For entrepreneur dashboard only : - * As we cannot have multiple imbricated filtering with the native sib-display, we manage it manually. + * As we cannot have multiple imbricated filtering with the native solid-display, we manage it manually. * @param {String} targetId - Id of the element to update */ function addProperFilterToSearchComponents(targetId) { @@ -582,7 +583,7 @@ function addProperFilterToSearchComponents(targetId) { hidden_field.setAttribute("value", keyword_field.value); hidden_field.value = keyword_field.value; - let parent_form = hidden_field.closest("sib-form"); + let parent_form = hidden_field.closest("solid-form"); parent_form.component.inputChange(); parent_form.dispatchEvent(new CustomEvent('formChange')); refreshPagination(); @@ -786,31 +787,31 @@ document.addEventListener("DOMContentLoaded", event => { refreshList("refusal_dialog_form", "pending_resources"); refreshList("improvement_dialog_form", "pending_resources"); refreshDatabase("validation_form"); - refreshUser("entrepreneur_profile_creation", "entrepreneur_info"); - refreshUser("entrepreneur_profile_creation", "entrepreneur_contact"); - refreshUser("entrepreneur_profile_creation", "entrepreneur_account_picture"); - refreshUser("entrepreneur_profile_creation", "entrepreneur_profile_edition"); - refreshUser("entrepreneur_profile_creation", "entrepreneur_profile_organisation"); - refreshUser("entrepreneur_profile_creation", "entrepreneur_profile_picture"); - refreshUser("mentor_profile_creation", "mentor_info"); - refreshUser("mentor_profile_creation", "mentor_complementary"); - refreshUser("mentor_profile_creation", "mentor_contact"); - refreshUser("mentor_profile_creation", "mentor_profile_edition"); - refreshUser("mentor_profile_creation", "mentor_profile_organisation"); - refreshUser("entrepreneur_profile_edition", "entrepreneur_info"); - refreshUser("entrepreneur_profile_edition", "entrepreneur_contact"); - refreshUser("entrepreneur_profile_organisation", "entrepreneur_info"); - refreshUser("entrepreneur_profile_organisation", "entrepreneur_contact"); - refreshUser("entrepreneur_profile_picture", "entrepreneur_account_picture"); - refreshUser("entrepreneur_profile_picture", "entrepreneur_info"); - refreshUser("mentor_profile_edition", "mentor_info"); - refreshUser("mentor_profile_edition", "mentor_complementary"); - refreshUser("mentor_profile_edition", "mentor_contact"); - refreshUser("mentor_profile_organisation", "mentor_info"); - refreshUser("mentor_profile_organisation", "mentor_complementary"); - refreshUser("mentor_profile_organisation", "mentor_contact"); - refreshUser("mentor_profile_picture", "mentor_account_picture"); - refreshUser("mentor_profile_picture", "mentor_info"); + // refreshUser("entrepreneur_profile_creation", "entrepreneur_info"); + // refreshUser("entrepreneur_profile_creation", "entrepreneur_contact"); + // refreshUser("entrepreneur_profile_creation", "entrepreneur_account_picture"); + // refreshUser("entrepreneur_profile_creation", "entrepreneur_profile_edition"); + // refreshUser("entrepreneur_profile_creation", "entrepreneur_profile_organisation"); + // refreshUser("entrepreneur_profile_creation", "entrepreneur_profile_picture"); + // refreshUser("mentor_profile_creation", "mentor_info"); + // refreshUser("mentor_profile_creation", "mentor_complementary"); + // refreshUser("mentor_profile_creation", "mentor_contact"); + // refreshUser("mentor_profile_creation", "mentor_profile_edition"); + // refreshUser("mentor_profile_creation", "mentor_profile_organisation"); + // refreshUser("entrepreneur_profile_edition", "entrepreneur_info"); + // refreshUser("entrepreneur_profile_edition", "entrepreneur_contact"); + // refreshUser("entrepreneur_profile_organisation", "entrepreneur_info"); + // refreshUser("entrepreneur_profile_organisation", "entrepreneur_contact"); + // refreshUser("entrepreneur_profile_picture", "entrepreneur_account_picture"); + // refreshUser("entrepreneur_profile_picture", "entrepreneur_info"); + // refreshUser("mentor_profile_edition", "mentor_info"); + // refreshUser("mentor_profile_edition", "mentor_complementary"); + // refreshUser("mentor_profile_edition", "mentor_contact"); + // refreshUser("mentor_profile_organisation", "mentor_info"); + // refreshUser("mentor_profile_organisation", "mentor_complementary"); + // refreshUser("mentor_profile_organisation", "mentor_contact"); + // refreshUser("mentor_profile_picture", "mentor_account_picture"); + // refreshUser("mentor_profile_picture", "mentor_info"); addProperFilterToSearchComponents("entrepreneur-resource-list"); addProperFilterToSearchComponents("mentor-database"); @@ -857,7 +858,7 @@ document.addEventListener("DOMContentLoaded", event => { // Manage closing the detail dialog from the profile link access var contributorProfileLinks = resourceDetailDialog.getElementsByTagName('cs-display-mentor-link'); for (let profileLink of contributorProfileLinks) { - let links = profileLink.getElementsByTagName('sib-link'); + let links = profileLink.getElementsByTagName('solid-link'); for (let link of links) { link.addEventListener('click', function() { let mentor_resource_detail = document.getElementById( @@ -913,7 +914,7 @@ document.addEventListener("DOMContentLoaded", event => { // Manage closing the detail dialog from the profile link access var resourceValidationProfileLinks = resourceValidationDialog.getElementsByTagName('cs-display-mentor-link'); for (let profileLink of resourceValidationProfileLinks) { - let links = profileLink.getElementsByTagName('sib-link'); + let links = profileLink.getElementsByTagName('solid-link'); for (let link of links) { link.addEventListener('click', function() { let mentor_validation_detail = document.getElementById( @@ -934,7 +935,7 @@ document.addEventListener("DOMContentLoaded", event => { refreshRequestList("change_status_request", "request_list"); //Refresh data list on delete resources - const deleteButton = document.querySelectorAll("sib-delete"); + const deleteButton = document.querySelectorAll("solid-delete"); for (var i = 0; i < deleteButton.length; i++) { deleteButton[i].addEventListener("resourceDeleted", async(e) => { const historyList = document.getElementById("resources_history"); @@ -995,7 +996,7 @@ document.addEventListener("DOMContentLoaded", event => { detailsSearcher.addEventListener("populate", event => { var searcherProfileLinks = document.getElementsByTagName('cs-display-entrepreneur-link'); for (let profileLink of searcherProfileLinks) { - let links = profileLink.getElementsByTagName('sib-link'); + let links = profileLink.getElementsByTagName('solid-link'); for (let link of links) { link.addEventListener('click', function() { let entrepreneur_resource_detail = document.getElementById( @@ -1011,7 +1012,7 @@ document.addEventListener("DOMContentLoaded", event => { detailsPublic.addEventListener("populate", event => { var userProfileLinks = document.getElementsByTagName('cs-display-user-link'); for (let profileLink of userProfileLinks) { - let links = profileLink.getElementsByTagName('sib-link'); + let links = profileLink.getElementsByTagName('solid-link'); for (let link of links) { link.addEventListener('click', function() { let public_resource_detail = document.getElementById( diff --git a/src/scripts/dispatch-space-n-user.js b/src/scripts/dispatch-space-n-user.js index b845a373989920220848f9a5bdd38513808fa0a0..8c417f585d83691514a48883ee73dc72854d37a0 100644 --- a/src/scripts/dispatch-space-n-user.js +++ b/src/scripts/dispatch-space-n-user.js @@ -1,4 +1,5 @@ -import { store } from 'https://unpkg.com/@startinblox/core@0.9'; +import { store } from 'https://unpkg.com/@startinblox/core@0.10'; +// import { store } from '/scripts/sib-core/dist/index.js'; const sibAuth = document.querySelector('sib-auth'); const context = { diff --git a/src/scripts/kb-reactivity.js b/src/scripts/kb-reactivity.js new file mode 100644 index 0000000000000000000000000000000000000000..6cc5bcf920db5584c16fbfe6f8c6bd28b4e8fb8f --- /dev/null +++ b/src/scripts/kb-reactivity.js @@ -0,0 +1,40 @@ +import { store } from 'https://unpkg.com/@startinblox/core@0.10'; +import { Sib } from "https://unpkg.com/@startinblox/core@0.10/dist/libs/Sib.js"; +import { StoreMixin } from "https://unpkg.com/@startinblox/core@0.10/dist/mixins/storeMixin.js"; + +export const KbReactivity = { + name: 'kb-reactivity', + use: [StoreMixin], + attributes: { + targetSrc: { + type: String, + default: '', + callback: function () { + this.subscribe(); + } + }, + dataSrc: { + type: String, + default: '', + callback: async function (value) { + this.resourceId = null; + if (this.nestedField) { + const resource = store.get(value) || await store.getData(value, this.context); + const nestedResource = await resource[this.nestedField] + this.resourceId = nestedResource ? nestedResource['@id'] : null; + } else { + this.resourceId = value; + } + this.subscribe(); + } + }, + }, + subscribe() { + if (this.resourceId && this.targetSrc) { + store.subscribeVirtualContainerTo(this.resourceId, this.targetSrc); + store.subscribeVirtualContainerTo(this.targetSrc, this.resourceId); + } + } +} + +Sib.register(KbReactivity); \ No newline at end of file diff --git a/src/styles/_header.scss b/src/styles/_header.scss index 544451436c25f26088607a1d3a48c02b9ab0c6b3..b2b52943b6438e0e7350b372ba13ff0f3b33bf57 100644 --- a/src/styles/_header.scss +++ b/src/styles/_header.scss @@ -10,6 +10,6 @@ summary { color: pink; } -sib-router { +solid-router { color: purple; } \ No newline at end of file diff --git a/src/styles/index.scss b/src/styles/index.scss index fdd1e67daa95b465cf52abeb87075d081ca967dc..1e675088c47c1897f32cb6986e8f2f90726c7175 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -164,17 +164,17 @@ img{ display: block; } -.flex, sib-set-default,#resources_history>div div, #entrepreneur-new-account sib-form form{ +.flex, solid-set-default,#resources_history>div div, #entrepreneur-new-account solid-form form{ display: flex; flex-direction: row; flex-wrap: wrap; justify-content: center; } -.flex_espace, sib-set-default,#resources_history>div div, #entrepreneur-new-account sib-form form { +.flex_espace, solid-set-default,#resources_history>div div, #entrepreneur-new-account solid-form form { justify-content: space-between; } -sib-set-default[name="actions"]{ +solid-set-default[name="actions"]{ justify-content: flex-end; } @@ -282,7 +282,7 @@ input[type="submit"].disabled { } .button_base, input[type="submit"], #mentor-resource-detail a, #entrepreneur-resource-detail a, -#mentor-resource-validate a, .sib-conversation form input[type="submit"], .solid-conversation form input[type="submit"], +#mentor-resource-validate a, .sib-conversation form input[type="submit"], .sib-conversation form input[type="submit"], #public-resource-detail a, #mentor-database-resource-detail a{ transition: all .3s ease-in-out; background-color: var(--bg-btn-base); @@ -300,7 +300,7 @@ input[type="submit"].disabled { } .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, #public-resource-detail a:hover, -#mentor-database-resource-detail a:hover,.solid-conversation form input[type="submit"]:hover{ +#mentor-database-resource-detail a:hover,.sib-conversation form input[type="submit"]:hover{ background-color: var(--bg-block); color: var(--bg-btn-base); } @@ -340,7 +340,7 @@ p{ font-size: 1.8rem; } -.backlink, .broken sib-link{ +.backlink, .broken solid-link{ display: inline-block; color: var(--clr-typo-base); font-size: 1.4rem; @@ -351,7 +351,7 @@ p{ cursor: pointer; } -.backlink:hover, .broken sib-link:hover{ +.backlink:hover, .broken solid-link:hover{ color: var(--bg-btn-base); } @@ -584,17 +584,17 @@ header .ico_search:before{ overflow: hidden; display: block; } -sib-form-label-text, sib-multiple-select, sib-form-dropdown, sib-form-auto-completion, sib-form-number{ +solid-form-label-text, solid-multiple-select, solid-form-dropdown, solid-form-auto-completion, solid-form-number{ display: block; width: 48.5%; } -sib-multiple-select > sib-form-auto-completion { +solid-multiple-select > solid-form-auto-completion { width: 100%; } -sib-form-label-text[name="linkedin"],sib-form-label-text[name="twitter"]{ +solid-form-label-text[name="linkedin"],solid-form-label-text[name="twitter"]{ width: 100%; } -cs-section_header, sib-form-textarea, form-textarea-custom{ +cs-section_header, solid-form-textarea, form-textarea-custom{ display: block; width: 100%; } @@ -691,11 +691,11 @@ div#mentor-database-resource-detail cs-display-property[name="name"] p{ cursor: pointer; } -sib-form-label-text[name="iframe_link"] div{ +solid-form-label-text[name="iframe_link"] div{ position:relative; } -sib-form-label-text[name="iframe_link"] div:before{ +solid-form-label-text[name="iframe_link"] div:before{ content: ""; display: block; width: 19px; @@ -839,7 +839,7 @@ header span.ico_search{ } } -header#header sib-form-dropdown>label>div { +header#header solid-form-dropdown>label>div { display: none; } /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -952,7 +952,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ a { margin: 0; } - sib-link, p,a { + solid-link, p,a { display: block; padding: 10px 20px; text-decoration: none; @@ -965,7 +965,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ padding: 0; } } - sib-link:hover, a:hover{ + solid-link:hover, a:hover{ background: #2D3132; } li:not(last-child){ @@ -1020,7 +1020,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX PAGE CREATE COMPTE ENTREPRISE XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ -#entrepreneur-new-account sib-form form input[type="submit"]{ //Tempo en fonction champs present +#entrepreneur-new-account solid-form form input[type="submit"]{ //Tempo en fonction champs present margin-top: 10rem; } @@ -1049,7 +1049,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ #entrepreneur-resource-list container, #public-resource-list container, #mentor-database container{ padding-top: 3.5rem;display: block; - sib-form-placeholder-text[name="name_keyword"]{ + solid-form-placeholder-text[name="name_keyword"]{ float: left; width: 76%; } @@ -1120,14 +1120,14 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ background-color: var(--bg-block); color: #5DC6F2; } - div sib-display div{ + div solid-display div{ padding: 1.5rem; } - div sib-display:nth-child(odd) div{ + div solid-display:nth-child(odd) div{ background: #F7F9FE; cursor: pointer; } - div sib-display:nth-child(even) div{ + div solid-display:nth-child(even) div{ background: white; cursor: pointer; } @@ -1263,19 +1263,19 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ cursor: pointer; } -.tabcontent sib-display>div>sib-display>div { +.tabcontent solid-display>div>solid-display>div { padding:20px; } -.tabcontent sib-display>div>sib-display:nth-of-type(odd)>div { +.tabcontent solid-display>div>solid-display:nth-of-type(odd)>div { background-color:#ECF1FB; } -.tabcontent sib-display>div>sib-display:nth-of-type(even)>div { +.tabcontent solid-display>div>solid-display:nth-of-type(even)>div { background-color:white; } -sib-set-default[name="content"]>*{ +solid-set-default[name="content"]>*{ display: block; width: 100%; text-align: left; @@ -1288,10 +1288,10 @@ div .tit_element_list{ font-size: 1.6rem; } #resources_history { - sib-set-default{ + solid-set-default{ margin-bottom: 4rem; } - sib-set-default[name="content"]{ + solid-set-default[name="content"]{ width: 50%; } hidden-widget{ @@ -1306,7 +1306,7 @@ div .tit_element_list{ padding-bottom: .5rem; } } -sib-display#pending_resources div{ +solid-display#pending_resources div{ clear: both; } .contenu_list{ @@ -1336,11 +1336,11 @@ div .contenu_list p, div .contenu_list label{ margin-right: 1rem; } -sib-display-value,sib-multiple label,cs-resource-status div{ +solid-display-value,solid-multiple label,cs-resource-status div{ font-weight: bold; } -sib-multiple label{ +solid-multiple label{ margin-right: 1rem; } #resources_history cs-resource-status[name="review.status"] { @@ -1376,7 +1376,7 @@ cs-display-resource-comment p.improvement_comment { margin-bottom: 20px; } -sib-multiple label, cs-resource-status[name="review.status"]+*{ +solid-multiple label, cs-resource-status[name="review.status"]+*{ float: left; width: auto; } @@ -1427,7 +1427,7 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ border: none; } } -#pending_resources > div sib-display>div{ +#pending_resources > div solid-display>div{ display:flex; justify-content: space-between; } @@ -1435,12 +1435,12 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ margin: 0; } #pending_resources { - sib-set-default[name="content"] sib-display-value{ + solid-set-default[name="content"] solid-display-value{ font-size: 1.6rem; color: #444C4D; margin-bottom: 2rem; } - sib-set-default[name="info"]{ + solid-set-default[name="info"]{ justify-content: flex-start; cs-display-resource-property{ margin-right: 0rem; @@ -1461,7 +1461,7 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ font-family: "var(--typo-btn)"; } - sib-set-default[name="info"]{ + solid-set-default[name="info"]{ justify-content: flex-start; margin-top: 1rem; cs-display-resource-property[name="submitter.email"] p, @@ -1483,7 +1483,7 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ position: relative; top: 35%; } -#requests sib-multiple{ +#requests solid-multiple{ margin-right: 7rem; label, cs-display-multiple-property[name="fields"] p{ color: var(--clr-roll-black); @@ -1496,7 +1496,7 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ } } .request_accordion { - sib-set-default cs-validate-action div{ + solid-set-default cs-validate-action div{ position: relative; top: -1rem; } @@ -1527,13 +1527,13 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ } .accordion{ - &:not(.active) + .panel sib-form + div { + &:not(.active) + .panel solid-form + div { overflow: hidden; transition: max-height 0.2s ease-out; max-height: 0; } - &.active + .panel sib-form + div { + &.active + .panel solid-form + div { overflow: hidden; transition: max-height 0.2s ease-out; max-height: 1500px; @@ -1541,7 +1541,7 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ } /* Enable the accordion of "more criteria form"*/ -sib-set-default[name="more_criterias_hidden"]{ +solid-set-default[name="more_criterias_hidden"]{ max-height: 235px; overflow: hidden; transition: max-height 0.2s ease-out; @@ -1586,7 +1586,7 @@ sib-set-default[name="more_criterias_hidden"]{ color: #5DC6F2; } } -sib-multiple.steps label { +solid-multiple.steps label { font-family: 'var(--typo-btn)'; font-weight: bold; padding-bottom: .5rem; @@ -1605,7 +1605,7 @@ cs-display-step-property[label] p{ cs-display-resource-property[name="format.name"] + *{ clear: both; } -sib-set-default[name="submitter_info"]{ +solid-set-default[name="submitter_info"]{ display: block; cs-display-resource-property:first-child b{ display: block; @@ -1639,7 +1639,7 @@ sib-set-default[name="submitter_info"]{ } } - sib-link.backlink { + solid-link.backlink { margin: 0; } } @@ -1665,7 +1665,7 @@ sib-set-default[name="submitter_info"]{ } } - sib-link.backlink { + solid-link.backlink { margin: 0; } h1{ @@ -1784,10 +1784,10 @@ sib-set-default[name="submitter_info"]{ color: var(--clr-roll-black); } } - cs-display-link *, sib-link{ + cs-display-link *, solid-link{ margin: 0; } - .broken sib-link{ + .broken solid-link{ margin: 1rem 0 0 3rem; } cs-display-property p{ @@ -1839,7 +1839,7 @@ div#entrepreneur-resource-detail cs-display-property[name="name"].title_form p { margin: 0; } -sib-multiple[name="skills"] { +solid-multiple[name="skills"] { label{ font-family: 'var(--typo-btn)'; margin: 0; @@ -1863,9 +1863,9 @@ sib-multiple[name="skills"] { } } -sib-set-default[name="specifications"] > cs-display-resource-property, -sib-set-default[name="specifications"] > cs-display-sharing, -sib-set-default[name="specifications"] > sib-multiple { +solid-set-default[name="specifications"] > cs-display-resource-property, +solid-set-default[name="specifications"] > cs-display-sharing, +solid-set-default[name="specifications"] > solid-multiple { display: block; float: left; width: 33%; @@ -1915,7 +1915,7 @@ cs-display-mentor-related, cs-display-entrepreneur-related { margin:0; font-size: 1.4rem; color: var(--clr-roll-black); - sib-link { + solid-link { color: #FFFFFF; } } @@ -1931,13 +1931,13 @@ cs-display-mentor-related, cs-display-entrepreneur-related { .sib-conversation div.conversation-form, -.solid-conversation div.conversation-form{ +.sib-conversation div.conversation-form{ border: none; position: relative; } div.sib-conversation textarea, -div.solid-conversation textarea{ +div.sib-conversation textarea{ border-radius: 0; background: white; height: 4.5rem; @@ -1946,7 +1946,7 @@ div.solid-conversation textarea{ } div.sib-conversation div.conversation-form:before, -div.solid-conversation div.conversation-form:before{ +div.sib-conversation div.conversation-form:before{ content: "\f27a"; font-family: "Font Awesome 5 pro"; font-weight: 900; @@ -1960,21 +1960,21 @@ div.solid-conversation div.conversation-form:before{ } .sib-conversation form, -.solid-conversation form{ +.sib-conversation form{ overflow: hidden; input[type="submit"]{ float: right; } } -div#requests.tabcontent sib-display.request_accordion div div> sib-display-value{ +div#requests.tabcontent solid-display.request_accordion div div> solid-display-value{ font-family: 'var(--typo-btn)'; font-size: 1.2rem; color: var(--clr-typo-base); float: left; } -div#requests.tabcontent sib-display.request_accordion div div> sib-set-default >sib-display-value{ +div#requests.tabcontent solid-display.request_accordion div div> solid-set-default >solid-display-value{ color: #444C4D; } @@ -1983,7 +1983,7 @@ cs-validate-action div{ text-align: right; } -#requests sib-set-default[name="content"] { +#requests solid-set-default[name="content"] { padding: 0 18px; max-height: 0; overflow: hidden; @@ -2006,16 +2006,16 @@ cs-display-user-link { /*XXXXXXXXXXXXXXXXXX Commentaires XXXXXXXXXXXXXXXXXXXXXXXXXXX*/ .sib-conversation div>.conversation-item, -.solid-conversation div>.conversation-item{ +.sib-conversation div>.conversation-item{ padding: 1.5rem; } .sib-conversation [name="conversation-content"], -.solid-conversation [name="conversation-content"]{ +.sib-conversation [name="conversation-content"]{ width: 90%; &>*{ width: 100%; } - sib-set-default[name="conversation-head"]>*, + solid-set-default[name="conversation-head"]>*, solid-set-default[name="conversation-head"]>*{ width: 100%; text-align: left; @@ -2025,7 +2025,7 @@ cs-display-user-link { margin: 0 0 1rem 0; font-weight: lighter; } - sib-set-default[name="conversation-head"]>*:first-child, + solid-set-default[name="conversation-head"]>*:first-child, solid-set-default[name="conversation-head"]>*:first-child{ order: 3; position: relative; @@ -2033,11 +2033,11 @@ cs-display-user-link { top: .5rem; font-size: 1.6rem; } - sib-set-default[name="conversation-head"]>*:last-child, + solid-set-default[name="conversation-head"]>*:last-child, solid-set-default[name="conversation-head"]>*:last-child{ order: 1; } - sib-set-default[name="conversation-author"], + solid-set-default[name="conversation-author"], solid-set-default[name="conversation-author"]{ text-align: left; font-size: 1.3rem; @@ -2077,7 +2077,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ margin: 1.5rem 0 0.5rem 0; font-weight: bold; } - sib-display:last-child{ + solid-display:last-child{ width: 100%; position: absolute; top: 100%; @@ -2179,9 +2179,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ #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 solid-display >div, +#public-resource-list container .step div solid-display >div, +#mentor-database container .step div solid-display >div{ margin-top: 2rem; } #mentor-database container.block_list .block_log, @@ -2207,7 +2207,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ box-shadow: inherit; } -#entrepreneur-request-create sib-set-default[name="complementary_information"] cs-section_header[name="header_complementary"] h2{ +#entrepreneur-request-create solid-set-default[name="complementary_information"] cs-section_header[name="header_complementary"] h2{ margin-top:3rem; } #entrepreneur-request-create form input[type="submit"]{ @@ -2286,16 +2286,16 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ left: 1rem; top: 1.7rem; } - #mentor-resource-detail .broken sib-link, #mentor-database-resource-detail .broken sib-link, #entrepreneur-resource-detail .broken sib-link, #mentor-resource-validate .broken sib-link, #entrepreneur-request-create .broken sib-link, #public-resource-detail .broken sib-link { + #mentor-resource-detail .broken solid-link, #mentor-database-resource-detail .broken solid-link, #entrepreneur-resource-detail .broken solid-link, #mentor-resource-validate .broken solid-link, #entrepreneur-request-create .broken solid-link, #public-resource-detail .broken solid-link { margin: 2rem 0 0 3rem; } #mentor-resource-detail, #mentor-database-resource-detail, #entrepreneur-resource-detail, #mentor-resource-validate, #entrepreneur-request-create, #public-resource-detail{ padding: 1rem 1rem 30% 1rem; } - #entrepreneur-resource-detail sib-set-default[name="content"], - #mentor-resource-detail sib-set-default[name="content"], - #mentor-database-resource-detail sib-set-default[name="content"], - #public-resource-detail sib-set-default[name="content"]{ + #entrepreneur-resource-detail solid-set-default[name="content"], + #mentor-resource-detail solid-set-default[name="content"], + #mentor-database-resource-detail solid-set-default[name="content"], + #public-resource-detail solid-set-default[name="content"]{ width: 100%; } #entrepreneur-account .button__actions, #mentor-account .button__actions{ @@ -2362,12 +2362,12 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ } .sib-conversation [name="conversation-wrapper"], .sib-conversation [name="message-wrapper"], - sib-display[nested-field="conversations"], - .solid-conversation [name="conversation-wrapper"], - .solid-conversation [name="message-wrapper"], + solid-display[nested-field="conversations"], + .sib-conversation [name="conversation-wrapper"], + .sib-conversation [name="message-wrapper"], solid-display[nested-field="conversations"] - sib-display[nested-field="dislikes"], - sib-display[nested-field="likes"]{ + solid-display[nested-field="dislikes"], + solid-display[nested-field="likes"]{ display: none!important; } @@ -2410,22 +2410,22 @@ b, strong { margin: 2rem; } } - #mentor-account .resources__newresource sib-link>div:first-child{ + #mentor-account .resources__newresource solid-link>div:first-child{ padding: 0; } #mentor-account .button__actions > div{ width: 50%; } - sib-form-label-text, sib-multiple-select, sib-form-dropdown, sib-form-auto-completion, sib-form-number{ + solid-form-label-text, solid-multiple-select, solid-form-dropdown, solid-form-auto-completion, solid-form-number{ width: 100%; } .input_photo{ margin: 1rem; } - sib-set-default[name="specifications"]{ + solid-set-default[name="specifications"]{ flex-direction: column; } - sib-set-default[name="specifications"] > cs-display-resource-property, sib-set-default[name="specifications"] > cs-display-sharing, sib-set-default[name="specifications"] > sib-multiple { + solid-set-default[name="specifications"] > cs-display-resource-property, solid-set-default[name="specifications"] > cs-display-sharing, solid-set-default[name="specifications"] > solid-multiple { width: 100%; } diff --git a/translation/en.yml b/translation/en.yml index 495ec50f37d207c1c8b2bec901dd4558bace2b48..21b48fdb60276713d0d1df2fb1f9b5ec2bdfa96b 100644 --- a/translation/en.yml +++ b/translation/en.yml @@ -3,7 +3,7 @@ Dashboard : Dashboard ResourcesDatabase : Resources database MyAccount : My account Logout : Logout -BackToDashboard : Back to dashboard → +BackToDashboard : Back to dashboard → BackToMyAccount : Back to my account Welcome : Welcome to our international index of resources for cooperative contributors and searchers GeneralLabel : International index of resources for cooperative contributors and searchers @@ -132,4 +132,6 @@ ImprovementRequired: Improvement required Published: Published PendingValidation: Pending validation CheckResource: "Check ->" -BackToAccount: Back to My Account \ No newline at end of file +AddAComment: Add a comment +YourMessageHere: Your message here +BackToAccount: Back to My Account diff --git a/translation/fr.yml b/translation/fr.yml index 0cf6fd5d72832d4f934cf7a3e8890be3d894b1a6..b744c9f5d8db81d59cbe385b315d9ef5b34ba8dc 100644 --- a/translation/fr.yml +++ b/translation/fr.yml @@ -100,12 +100,12 @@ TypeContentReq: Type de contenu* CategorisationReq: Categorisation* ShareWithReq: Partager avec* AddResource: Ajouter une ressource -SendForValidation : Envoyer pour validation -> +SendForValidation : Envoyer pour validation → EditResource : Modifier cette ressource RequireImprovement: "Besoin d'amélioration" ReportInappropriate: "Signaler comme inapproprié" Validate: Valider -Send: Envoyer -> +Send: Envoyer → SuggestImprovement: Suggérer des améliorations ExplainImprovementRequired: Expliquez les améliorations nécessaires*. ThanksForReview: Merci pour votre avis @@ -123,5 +123,7 @@ AboutYouExplanation : Ces informations apparaitront sur votre profil pour inform ImprovementRequired: Amélioration requise PendingValidation: En attente de validation Published: Publiée -CheckResource: "Vérifier ->" -BackToAccount: Retour à mon profil \ No newline at end of file +CheckResource: "Vérifier →" +AddAComment: Ajouter un commentaire +YourMessageHere: Votre message ici +BackToAccount: Retour à mon profil