diff --git a/src/includes/contributor/resources/database.pug b/src/includes/contributor/resources/database.pug index e7f11b9c11aea15990cfa8f822665587a348c7b4..9fbba59d68b1323af4682af5d8fdd1c7640f2452 100644 --- a/src/includes/contributor/resources/database.pug +++ b/src/includes/contributor/resources/database.pug @@ -82,12 +82,12 @@ container.block_list.flex.flex_espace //Step 1 div.step - div#resources-loader-step1-browse-database + div#resources-loader-step1-contributor hidden i.fas.fa-spinner.fa-spin + solid-display( no-render - loader-id="resources-loader-step1-browse-database" data-src=`${endpoints.steps}1/`, fields='name' class="accordion active" @@ -97,10 +97,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - - div#resources-loader-step1-contributor - hidden - i.fas.fa-spinner.fa-spin solid-display.resource_by_step( no-render @@ -124,6 +120,10 @@ container.block_list.flex.flex_espace //Step 2 div.step + div#resources-loader-step2-contributor + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}2/`, @@ -136,10 +136,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - div#resources-loader-step2-contributor - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render data-src=`${endpoints.step2}` @@ -162,6 +158,10 @@ container.block_list.flex.flex_espace //Step 3 div.step + div#resources-loader-step3-contributor + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}3/`, @@ -173,10 +173,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - - div#resources-loader-step3-contributor - hidden - i.fas.fa-spinner.fa-spin solid-display.resource_by_step( no-render @@ -200,6 +196,10 @@ container.block_list.flex.flex_espace //Step 4 div.step + div#resources-loader-step4-contributor + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}4/`, @@ -211,10 +211,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - - div#resources-loader-step4-contributor - hidden - i.fas.fa-spinner.fa-spin solid-display.resource_by_step( no-render @@ -238,6 +234,10 @@ container.block_list.flex.flex_espace //Step 5 div.step + div#resources-loader-step5-contributor + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}5/`, @@ -249,10 +249,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - - div#resources-loader-step5-contributor - hidden - i.fas.fa-spinner.fa-spin solid-display.resource_by_step( no-render @@ -276,6 +272,10 @@ container.block_list.flex.flex_espace //Step 6 div.step + div#resources-loader-step6-contributor + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}6/`, @@ -287,10 +287,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - - div#resources-loader-step6-contributor - hidden - i.fas.fa-spinner.fa-spin solid-display.resource_by_step( no-render diff --git a/src/includes/contributor/resources/resource-report-broken-link-contributor.pug b/src/includes/contributor/resources/resource-report-broken-link-contributor.pug index f456d9298484e3d8aa878c870acaf1c7aad7faa7..4f5eed97e968a4245cf165350001f9bea898024e 100644 --- a/src/includes/contributor/resources/resource-report-broken-link-contributor.pug +++ b/src/includes/contributor/resources/resource-report-broken-link-contributor.pug @@ -1,9 +1,4 @@ .block_log.block_creat_count.no_shadow - solid-link(class="backlink", next="contributor-resource-list") - .like - p - i.fas.fa-times - h2.title_lead_avenir=`${data.Thanks}` p=`${data.ConfirmSendBrokenLink}` solid-form#report-broken-link-contributor( diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug index 6ae89eeaefa1ba447949ba1d1ae4ed74b77403f1..8c877f79810864f114581863001cfd8a6dc6b0ce 100644 --- a/src/includes/public/resources/list.pug +++ b/src/includes/public/resources/list.pug @@ -13,15 +13,7 @@ container.block_list.flex.flex_espace div.w_75.block-g-entre div h2.title_form=`${data.SearchForResource}` - - //- solid-form.instance_database_only( - //- data-src=`${endpoints.resources}`, - //- fields='instance_database_only' - //- widget-instance_database_only='cs-display-checkbox' - //- class-instance_database_only = 'ss-list checkbox' - - //- naked - //- ) + solid-form-search.more_criterias.flex.flex_espace( no-render id="public-filter-form" @@ -73,6 +65,10 @@ container.block_list.flex.flex_espace //Step 1 div.step + div#resources-loader-step1-public + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}1/`, @@ -85,10 +81,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - div#resources-loader-step1-public - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render loader-id="resources-loader-step1-public" @@ -111,6 +103,10 @@ container.block_list.flex.flex_espace //Step 2 div.step + div#resources-loader-step2-public + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}2/`, @@ -123,10 +119,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - div#resources-loader-step2-public - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render loader-id="resources-loader-step2-public" @@ -149,6 +141,10 @@ container.block_list.flex.flex_espace //Step 3 div.step + div#resources-loader-step3-public + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}3/`, @@ -161,10 +157,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - div#resources-loader-step3-public - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render loader-id="resources-loader-step3-public" @@ -187,6 +179,10 @@ container.block_list.flex.flex_espace //Step 4 div.step + div#resources-loader-step4-public + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}4/`, @@ -199,10 +195,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - div#resources-loader-step4-public - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render loader-id="resources-loader-step4-public" @@ -225,6 +217,10 @@ container.block_list.flex.flex_espace //Step 5 div.step + div#resources-loader-step5-public + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}5/`, @@ -237,10 +233,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - div#resources-loader-step5-public - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render loader-id="resources-loader-step5-public" @@ -262,6 +254,10 @@ container.block_list.flex.flex_espace ) //Step 6 div.step + div#resources-loader-step6-public + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}6/`, @@ -273,10 +269,6 @@ container.block_list.flex.flex_espace widget-name='cs-steps-header' ) - - div#resources-loader-step6-public - hidden - i.fas.fa-spinner.fa-spin solid-display.resource_by_step( no-render 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 116e4bae5e2d25c928a5686dfd4a6706bdf5fac5..a39faf20d82726a140ff8408d3b603b2db3d8e59 100644 --- a/src/includes/public/resources/resource-report-broken-link-public.pug +++ b/src/includes/public/resources/resource-report-broken-link-public.pug @@ -1,9 +1,4 @@ .block_log.block_creat_count.no_shadow - solid-link(class="backlink", next="public-resource-list") - .like - p - i.fas.fa-times - h2.title_lead_avenir=`${data.Thanks}` p=`${data.ConfirmSendBrokenLink}` solid-form#report-broken-link-public( diff --git a/src/includes/searcher/resources/list.pug b/src/includes/searcher/resources/list.pug index b4444b6a21e054577b971cdd579b777faf68bb54..9223fd95c1ffe6706b2d40c073ebbbbc68121e38 100644 --- a/src/includes/searcher/resources/list.pug +++ b/src/includes/searcher/resources/list.pug @@ -15,15 +15,6 @@ container.block_list div h2.title_form=`${data.SearchForResource}` - //- solid-form.instance_database_only( - //- data-src=`${endpoints.resources}`, - //- fields='instance_database_only' - //- widget-instance_database_only='cs-display-checkbox' - //- class-instance_database_only = 'ss-list checkbox' - - //- naked - //- ) - solid-form-search.more_criterias.flex.flex_espace( id="searcher-filter-form" data-src=`${endpoints.resources}` @@ -82,6 +73,10 @@ container.block_list //Step 1 div.step + div#resources-loader-step1-searcher + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}1/`, @@ -97,10 +92,6 @@ container.block_list widget-description='cs-steps-header-description' ) - div#resources-loader-step1-searcher - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render data-src=`${endpoints.step1}` @@ -123,6 +114,10 @@ container.block_list //Step 2 div.step + div#resources-loader-step2-searcher + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}2/`, @@ -137,11 +132,7 @@ container.block_list widget-name='cs-steps-header' widget-description='cs-steps-header-description' ) - - div#resources-loader-step2-searcher - hidden - i.fas.fa-spinner.fa-spin - + solid-display.resource_by_step( no-render data-src=`${endpoints.step2}` @@ -163,6 +154,10 @@ container.block_list ) div.step + div#resources-loader-step3-searcher + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}3/`, @@ -178,10 +173,6 @@ container.block_list widget-description='cs-steps-header-description' ) - div#resources-loader-step3-searcher - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render data-src=`${endpoints.step3}` @@ -204,6 +195,10 @@ container.block_list //Step 4 div.step + div#resources-loader-step4-searcher + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}4/`, @@ -219,11 +214,7 @@ container.block_list widget-description='cs-steps-header-description' ) - - div#resources-loader-step4-searcher - hidden - i.fas.fa-spinner.fa-spin - + solid-display.resource_by_step( no-render data-src=`${endpoints.step4}` @@ -246,6 +237,10 @@ container.block_list //Step 5 div.step + div#resources-loader-step5-searcher + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}5/`, @@ -261,10 +256,6 @@ container.block_list widget-description='cs-steps-header-description' ) - div#resources-loader-step5-searcher - hidden - i.fas.fa-spinner.fa-spin - solid-display.resource_by_step( no-render data-src=`${endpoints.step5}` @@ -287,6 +278,10 @@ container.block_list //Step 6 div.step + div#resources-loader-step6-searcher + hidden + i.fas.fa-spinner.fa-spin + solid-display( no-render data-src=`${endpoints.steps}6/`, @@ -301,10 +296,6 @@ container.block_list widget-name='cs-steps-header' widget-description='cs-steps-header-description' ) - - div#resources-loader-step6-searcher - hidden - i.fas.fa-spinner.fa-spin solid-display.resource_by_step( no-render diff --git a/src/includes/searcher/resources/resource-report-broken-link-searcher.pug b/src/includes/searcher/resources/resource-report-broken-link-searcher.pug index d79a93a438fe6272ef487d5cdd7712ad4fc98ac4..29b6725f375c2953a94e0959ff1ae35bece04a38 100644 --- a/src/includes/searcher/resources/resource-report-broken-link-searcher.pug +++ b/src/includes/searcher/resources/resource-report-broken-link-searcher.pug @@ -1,9 +1,4 @@ .block_log.block_creat_count.no_shadow - solid-link(class="backlink", next="searcher-resource-list") - .like - p - i.fas.fa-times - h2.title_lead_avenir=`${data.Thanks}` p=`${data.ConfirmSendBrokenLink}` solid-form#report-broken-link-searcher( diff --git a/src/styles/index.scss b/src/styles/index.scss index 13a77ed0c44239edc4ea4e57ea0d34895c638abc..0e000113b0fbe6057fc9a0ef94aac42024837821 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -288,7 +288,7 @@ input[type="submit"].disabled { } .button_base, input[type="submit"], #contributor-resource-detail a, #searcher-resource-detail a, -#contributor-resource-validate a, .sib-conversation form input[type="submit"], .sib-conversation form input[type="submit"], +#contributor-resource-validate a, .solid-conversation form input[type="submit"], .solid-conversation form input[type="submit"], #public-resource-detail a, #contributor-database-resource-detail a{ transition: all .3s ease-in-out; background-color: var(--bg-btn-base); @@ -307,8 +307,8 @@ input[type="submit"].disabled { .button_base:hover, input[type="submit"]:hover, #contributor-resource-detail a:hover, #contributor-resource-validate a:hover, -#searcher-resource-detail a:hover,.sib-conversation form input[type="submit"]:hover, #public-resource-detail a:hover, -#contributor-database-resource-detail a:hover,.sib-conversation form input[type="submit"]:hover{ +#searcher-resource-detail a:hover,.solid-conversation form input[type="submit"]:hover, #public-resource-detail a:hover, +#contributor-database-resource-detail a:hover,.solid-conversation form input[type="submit"]:hover{ background-color: var(--bg-block); color: var(--bg-btn-base); } @@ -2157,14 +2157,14 @@ solid-multiple[name="related"] solid-display-value { } -.sib-conversation div.conversation-form, -.sib-conversation div.conversation-form{ +.solid-conversation div.conversation-form, +.solid-conversation div.conversation-form{ border: none; position: relative; } -div.sib-conversation textarea, -div.sib-conversation textarea{ +div.solid-conversation textarea, +div.solid-conversation textarea{ border-radius: 0; background: white; height: 4.5rem; @@ -2172,8 +2172,8 @@ div.sib-conversation textarea{ font-size: 1.6rem; } -div.sib-conversation div.conversation-form:before, -div.sib-conversation div.conversation-form:before{ +div.solid-conversation div.conversation-form:before, +div.solid-conversation div.conversation-form:before{ content: "\f27a"; font-family: "Font Awesome 5 pro"; font-weight: 900; @@ -2186,8 +2186,8 @@ div.sib-conversation div.conversation-form:before{ color: var(--bg-btn-base); } -.sib-conversation form, -.sib-conversation form{ +.solid-conversation form, +.solid-conversation form{ overflow: hidden; input[type="submit"]{ float: right; @@ -2232,12 +2232,12 @@ cs-display-user-link { /*XXXXXXXXXXXXXXXXXX Commentaires XXXXXXXXXXXXXXXXXXXXXXXXXXX*/ -.sib-conversation div>.conversation-item, -.sib-conversation div>.conversation-item{ +.solid-conversation div>.conversation-item, +.solid-conversation div>.conversation-item{ padding: 1.5rem; } -.sib-conversation [name="conversation-content"], -.sib-conversation [name="conversation-content"]{ +.solid-conversation [name="conversation-content"], +.solid-conversation [name="conversation-content"]{ width: 90%; &>*{ width: 100%; @@ -2269,6 +2269,9 @@ cs-display-user-link { text-align: left; font-size: 1.3rem; } + widget-list-messages { + display: none; + } } /*XXXXXXXXXXXXXXXXXX Partage XXXXXXXXXXXXXXXXXXXXXXXXXXX*/ @@ -2597,11 +2600,11 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ color: var(--bg-btn-base); } } - .sib-conversation [name="conversation-wrapper"], - .sib-conversation [name="message-wrapper"], + .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-conversation [name="conversation-wrapper"], + .solid-conversation [name="message-wrapper"], solid-display[nested-field="conversations"] solid-display[nested-field="dislikes"], solid-display[nested-field="likes"]{