From 3a38b75821e58cb0e67e0e157145bd497c73fad2 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 11 Sep 2019 10:33:44 +0200
Subject: [PATCH 1/4] Work on resource detail and dialog
---
src/includes/mentor/resources/detail.pug | 16 ++-
src/includes/mentor/resources/list.pug | 1 +
src/styles/index.scss | 132 +++++++++++++++++++++--
3 files changed, 141 insertions(+), 8 deletions(-)
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 84265290..427645b0 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -1,6 +1,6 @@
include ../../components/widgets
-.block_log.block_creat_count
+.block_log.block_creat_count.no_shadow
sib-display(
bind-resources,
fields='name, steps, format, content(preview_image, tags),\
@@ -12,12 +12,17 @@ include ../../components/widgets
edit',
widget-submitter.name='cs-display-resource-property',
+ class-name="title_form"
+ class-steps="steps"
widget-edit='sib-action',
widget-author='cs-display-resource-property',
widget-country='cs-display-resource-property',
widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+ class-submitter.name="autor_ressource"
+ class-broken="broken"
widget-format='cs-display-multiple-property'
widget-uri='cs-display-link'
+ class-uri="pull-left"
widget-skills='cs-display-resource-property'
widget-description='cs-display-property'
widget-name='cs-display-property'
@@ -29,6 +34,7 @@ include ../../components/widgets
widget-review.status='cs-resource-status'
widget-review.reviewer.account.picture='cs-account-picture'
widget-review.reviewer.name='cs-resource-reviewer'
+ class-review.reviewer.name="validator_ressource"
widget-header_specifications='cs-section_header'
label-broken='Report broken link'
@@ -63,6 +69,14 @@ include ../../components/widgets
action-broken='resource-report-broken-link'
)
+ //- Add likes here
+ <div class="like">
+ <p class="backlink"><i class='far fa-thumbs-up'></i>18</p>
+ <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
+ </div>
+ <div class="like">
+ <p class="backlink"><i class="fas fa-times"></i></p>
+ </div>
sib-display(
bind-resources
fields=""
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index 185e7b69..8fcfea89 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -37,6 +37,7 @@ div.block_list
action-validate='mentor-resource-validate'
label-validate='Check ->'
+ class-validate="check_ressource"
widget-validate='cs-validate-action'
)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 6f55b44d..073ce879 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -122,6 +122,10 @@ img{
width: auto;
}
+.block{
+ display: block;
+}
+
.flex, sib-set-default,#resources-history>div div, #entrepreneur-new-account sib-form form{
display: flex;
flex-direction: row;
@@ -129,7 +133,7 @@ img{
justify-content: center;
}
-.flex_espace, sib-set-default,#resources-history>div div, #entrepreneur-new-account sib-form form{
+.flex_espace, sib-set-default,#resources-history>div div, #entrepreneur-new-account sib-form form {
justify-content: space-between;
}
sib-set-default[name="actions"]{
@@ -218,6 +222,10 @@ body{
margin: 0 auto;
}
+.no_shadow{
+ box-shadow: none;
+}
+
.button_base, input[type="submit"], #mentor-resource-detail a,.sib-conversation form input[type="submit"]{
transition: all .3s ease-in-out;
background-color: var(--bg-btn-base);
@@ -273,7 +281,7 @@ p{
font-size: 1.8rem;
}
-.backlink{
+.backlink, .broken sib-link{
display: inline-block;
color: var(--clr-typo-base);
font-size: 1.4rem;
@@ -284,7 +292,7 @@ p{
cursor: pointer;
}
-.backlink:hover{
+.backlink:hover, .broken sib-link:hover{
color: var(--bg-btn-base);
}
@@ -432,7 +440,7 @@ input, textarea, select, form .ss-main .ss-multi-selected{
input:focus, textarea:focus{
background: var(--bg-form-focus);
}
-.title_form, cs-section_introduction h2, div#mentor-resource-detail cs-display-property[name="name"] p{
+.title_form,.title_form p, cs-section_introduction h2, div#mentor-resource-detail cs-display-property[name="name"] p{
font-family: 'var(--typo)';
font-size: 2.2rem;
text-align: left;
@@ -585,7 +593,7 @@ header#header img {
background: blue;
margin-right: 5rem;
}
-header#header .avatar img{
+header#header .avatar img, #mentor-resource-detail .avatar img{
border-radius: 50%;
}
@@ -618,6 +626,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
width: 3rem;
height: 3rem;
border-radius: 50%;
+ cursor: pointer;
}
#header .flex, #header>div{
@@ -843,7 +852,44 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{
display:flex;
justify-content: space-between;
}
-
+
+#pending-resources {
+ sib-set-default[name="content"] sib-display-value{
+ font-size: 1.6rem;
+ color: #444C4D;
+ margin-bottom: 2rem;
+ }
+ sib-set-default[name="info"]{
+ justify-content: flex-start;
+ cs-display-resource-property{
+ margin-right: 0rem;
+ p,b{
+ color: var(--clr-typo-base);
+ font-size: 1.4rem;
+ }
+ }
+ }
+}
+.request_accordeon {
+ sib-set-default[name="content"] sib-display-value{
+ font-size: 1.6rem;
+ color: #444C4D;
+ }
+ sib-set-default[name="info"]{
+ justify-content: flex-start;
+ cs-display-resource-property{
+ margin-right: 7rem;
+ p,b{
+ color: var(--clr-typo-base);
+ font-size: 1.4rem;
+ }
+ }
+ }
+}
+.check_ressource>div{
+ position: relative;
+ top: 35%;
+}
/*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
cs-display-step-property[label="Step"] p{
@@ -871,10 +917,81 @@ sib-set-default[name="submitter_info"]{
margin-bottom: 1rem;
}
}
+
+#mentor-resource-detail{
+ border: none;
+ top: 0;
+ padding: 0;
+ width: 100%;
+ height: auto;
+ background: rgba(0,0,0,0.7);
+ .block_creat_count{
+ margin: 0 0 0 auto;
+ }
+ .title_form{
+ font-size: 1.6rem;
+ color: #3D424A;
+ font-family: 'var(--typo-btn)';
+ text-align: left;
+ border: none;
+ font-weight: bold;
+ margin: 0 0 1.5rem 0;
+ padding: 0;
+ p {
+ font-size: 2.2rem;
+ margin: 0 0 2rem 0;
+ font-weight: normal;
+ }
+ }
+ cs-display-multiple-property[name="format"] p{
+ text-align: right;
+ }
+ .avatar{
+ float: left;
+ margin-right: 1rem;
+ }
+ .steps{
+ cs-display-step-property p{
+ color: #3D424A;
+ font-size: 2.2rem;
+ }
+ }
+ .like{
+ display: flex;
+ flex-wrap: nowrap;
+ justify-content: flex-end;
+ p.backlink{
+ font-size: 1.4rem;
+ margin:0 0 0 2.5rem;
+ text-decoration: none;
+ }
+ }
+ .autor_ressource, .validator_ressource{
+ p{
+ color: var(--clr-typo-base);
+ font-size: 1.4rem;
+ }
+ b{
+ display: block;
+ color: var(--clr-roll-black);
+ }
+ }
+ cs-display-link *, sib-link{
+ margin: 0;
+ }
+ .broken sib-link{
+ margin: 1rem 0 0 3rem;
+ }
+ cs-display-property p{
+ clear: both;
+ padding-top: 2rem;
+ }
+}
+
#mentor-resource-detail a{
text-decoration: none;
display: inline-block;
- margin: 3rem 0;
+ margin: 0;
}
sib-set-default[name="specifications"]>cs-display-resource-property,
@@ -941,6 +1058,7 @@ cs-validate-action div{
clear: both;
text-align: right;
}
+
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX PROFILE XXXXXXXXXXXXXXXXXXXXX
--
GitLab
From d786f2d1d5643e9f57dea6e92800ad6445504671 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 11 Sep 2019 11:48:59 +0200
Subject: [PATCH 2/4] Quick adjustment
---
src/includes/mentor/dashboard.pug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index 77b3b603..1abc49f8 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -19,7 +19,7 @@ section#home
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-detail', use-id)
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-validate', use-id)
- dialog#mentor-resource-detail.no-sidebar.container
+ dialog#mentor-resource-detail.no-sidebar
include resources/detail.pug
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
--
GitLab
From f526e5f3cfd4bedce002b596d8d39c6ab56b42dd Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Fri, 13 Sep 2019 10:36:03 +0200
Subject: [PATCH 3/4] Fix the thing
---
src/images/asid_entre.png | Bin 0 -> 3210 bytes
src/includes/entrepreneur/dashboard.pug | 6 +-
src/includes/entrepreneur/profile/detail.pug | 40 +++
src/includes/entrepreneur/profile/edit.pug | 28 ++
src/includes/entrepreneur/resources/list.pug | 262 ++++++++++++++++++-
src/includes/mentor/profile.pug | 5 +-
src/styles/index.scss | 63 ++++-
7 files changed, 386 insertions(+), 18 deletions(-)
create mode 100644 src/images/asid_entre.png
create mode 100644 src/includes/entrepreneur/profile/detail.pug
create mode 100644 src/includes/entrepreneur/profile/edit.pug
diff --git a/src/images/asid_entre.png b/src/images/asid_entre.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cbad5cd4b10fe82760dd53c805a380c82736728
GIT binary patch
literal 3210
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
literal 0
HcmV?d00001
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 69b824c5..da0ecac8 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -8,10 +8,6 @@ header#header(role='banner')
section#home
- h1 Mentorship program
-
- p International index of resources for cooperative mentors and entrepreneurs
-
//TODO:
//-Distinguish the search form from the listing
//-Create two Sib-displays getting the resources by "types"
@@ -37,4 +33,4 @@ section#home
sib-link(next='entrepreneur-resource-list', class='button_base') Ok
#entrepreneur-account(hidden)
- h2 account
+ include ./profile/detail.pug
diff --git a/src/includes/entrepreneur/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug
new file mode 100644
index 00000000..722ed9a8
--- /dev/null
+++ b/src/includes/entrepreneur/profile/detail.pug
@@ -0,0 +1,40 @@
+include ../../components/widgets
+
+div.container_min
+ h2.title_lead.fd_bleu My Account
+
+div.block_list.flex
+ div.button__actions.w_25
+
+ div.dashboard__database
+ sib-link(next='entrepreneur-database')
+ div.button_base.ico_gauche.ico_database Browse database
+
+ div.dashboard__database
+ sib-link(next='entrepreneur-resource-list')
+ div.button_base.ico_gauche.ico_search Back to dashboard
+
+ div.dashboard__database
+ div.logout-button.button_base(
+ role='log out'
+ ) Logout
+
+ div.profile_information.block_log.w_75
+ sib-link(next='entrepreneur-account-edit')
+ button.button_edit <i class="fas fa-pen" aria-hidden="true"></i>
+
+ sib-display(
+ bind-user
+ fields='name, entrepreneur_profile.organisation.name, registered_on'
+ widget-name='cs-display-property'
+ widget-entrepreneur_profile.organisation.name='cs-display-property'
+ widget-entrepreneur_profile.registered_on='cs-display-property'
+ )
+
+ sib-display(
+ bind-user
+ fields='email'
+ label-email='Email:'
+ class-email="contact_profil"
+ widget-email='cs-display-resource-property'
+ )
\ No newline at end of file
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
new file mode 100644
index 00000000..e59fb33a
--- /dev/null
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -0,0 +1,28 @@
+include ../../components/widgets
+
+h2.title_create Edit your account
+
+sib-form.block_log.block_creat_count(
+ bind-user
+ fields="last_name, first_name, username, email, entrepreneur_profile.organisation"
+ range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-username="Username"
+ label-entrepreneur_profile.organisation="Organisation"
+
+ widget-username="sib-form-hidden"
+
+ class-last_name='form-label is-dark'
+ class-first_name='form-label is-dark'
+ class-email='form-label is-dark'
+ class-entrepreneur_profile.phone='form-label is-dark'
+
+ class-entrepreneur_profile.organisation='form-label is-dark'
+ multiple-entrepreneur_profile.organisation='sib-multiple-select'
+ widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+
+ submit-button="Save modifications"
+ next='entrepreneur-resource-list'
+)
\ No newline at end of file
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 3270dd35..5665de35 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -1,10 +1,90 @@
include ../../components/widgets
-p: a Watch a video presentation
-h2 Search for a resource
+div.container_min
+ h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
+ button.button_dark.pull-right Watch the presentation
+
+//-Question :
+//In my opinion, "multiple ressource" solution is closer to the wanted result than the "group-by" solution
+
+//Maybe we sould think from now how we gonna manage the type filter
+
+//What's the best way to retrieve the name of the format? By the resource we get a number. Sould we manage this with a 'switch/case' in js?
+
+//It seems that we don't have likes and dislikes data : sould i ignore them for the moment?
+
+
+container.block_list.flex.flex_espace
+
+ div.w_75.block-g-entre
+ div
+ h2.title_form Search for a resource
+ sib-form#search-by-keyword(
+ data-src=`${endpoints.resources}`,
+ fields='keyword(name_keyword, description, author)'
+ label-keyword="Search by author, name..."
+ widget-keyword="sib-form-placeholder-text"
+
+ widget-description='cs-display-property'
+ widget-name_keyword='cs-display-property'
+ widget-author='cs-display-property'
+
+ submit-button='Search'
+ )
+
+ sib-form(
+ data-src=`${endpoints.resources}`,
+ fields='instance_database_only'
+
+ widget-instance_database_only='cs-display-checkbox'
+
+ class-instance_database_only = 'ss-list checkbox'
+ naked
+ )
+
+ sib-form(
+ data-src=`${endpoints.resources}`,
+ fields='header_criterias, format, publication_year, country, language.name, fields, steps'
+
+ label-header_criterias='More criterias'
+ label-format='Format:'
+ label-publication_year='Year of publication'
+ label-country='Country of publication'
+ label-language.name='Language'
+ label-fields='Field'
+ label-steps='Step of : Staring up a cooperative business'
+ widget-header_criterias='cs-section_header'
+
+ range-language.name=`${endpoints.languages}`
+ range-fields=`${endpoints.fields}`
+ range-steps=`${endpoints.steps}`
+ range-format=`${endpoints.formats}`
+
+ multiple-language.name='sib-multiple-select'
+ widget-language.name='sib-form-auto-completion'
+
+ multiple-format='sib-multiple-select'
+ widget-format='sib-form-auto-completion'
+
+ multiple-fields='sib-multiple-select'
+ widget-fields='sib-form-auto-completion'
+
+ multiple-steps='sib-multiple-select'
+ widget-steps='sib-form-auto-completion'
+
+ naked
+ )
+ div.w_25
+ div.block_aside_entre
+ img(src="../images/asid_entre.png" alt="rechercher de ressources")
+ p Can't find the ressource you need ?
+ div.button__actions
+ sib-link(next='entrepreneur-request-create')
+ div
+ div.button_base Make a request
+
-#circles
sib-display#circles-list(
data-src=`${endpoints.resources}`,
fields='name, description, format, info(author, publication_year, language.name), steps',
@@ -19,9 +99,173 @@ h2 Search for a resource
next='detail'
)
-div.side-block
- p Can't find the ressource you need ?
- div.button__actions
- sib-link(next='entrepreneur-request-create')
- div
- div.button_base.ico_gauche.ico_plus Make a request
\ No newline at end of file
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}2/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}3/`,
+ fields='name'
+
+ label-name ='Step 3 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}3/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}4/`,
+ fields='name'
+
+ label-name ='Step 4 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}4/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}5/`,
+ fields='name'
+
+ label-name ='Step 5 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}5/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+//- search-fields="keyword, instance_database_only,\
+//- more_criterias(header_criterias, format, publication_year, country, language, field, step)"
+//- search-label-keyword="Search by author, name..."
+//- search-label-header_criterias='More criterias'
+//- search-label-format='Format'
+//- search-label-publication_year='Year of publication'
+//- search-label-country='Country of publication'
+//- search-label-language='Language'
+//- search-label-field='Field'
+//- search-label-step='Step of : Staring up a cooperative business'
+//- search-widget-keyword="sib-form-placeholder-text"
+//- search-widget-instance_database_only='cs-display-checkbox'
+//- search-widget-header_criterias='cs-section_header'
+
+//- search-range-language=`${endpoints.languages}`
+//- search-range-field=`${endpoints.fields}`
+//- search-range-step=`${endpoints.step}`
+
+//- search-multiple-language='sib-multiple-select'
+//- search-widget-language='sib-form-auto-completion'
+
+//- search-multiple-field='sib-multiple-select'
+//- search-widget-field='sib-form-auto-completion'
+
+//- search-multiple-step='sib-multiple-select'
+//- search-widget-step='sib-form-auto-completion'
+
+//- widget-description='cs-display-property'
+//- widget-name='cs-display-property'
diff --git a/src/includes/mentor/profile.pug b/src/includes/mentor/profile.pug
index 55c9374b..2a187952 100644
--- a/src/includes/mentor/profile.pug
+++ b/src/includes/mentor/profile.pug
@@ -19,11 +19,14 @@ div.block_list.flex
div.button_base.ico_gauche.ico_search Back to dashboard
div.dashboard__database
- div#logout-button.button_base(
+ div.logout-button.button_base(
role='log out'
) Logout
div.profile_information.block_log.w_75
+ sib-link(next='mentor-account-edit')
+ button.button_edit <i class="fas fa-pen" aria-hidden="true"></i>
+
sib-display(
bind-user
fields='account.picture, name, mentor_profile.headline, mentor_profile.city, mentor_profile.country, registered_on'
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 073ce879..5fc9ebf9 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -382,6 +382,9 @@ ico_droite:before{
#mentor-resource-detail a:before{ /* ico link to ressource dans détail ressources*/
content:"\f0c1";
}
+.ico_arrow:before{
+ content: "\f061";
+}
/*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx FIN ICONE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
@@ -543,12 +546,12 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
color: #818998;
font-weight: lighter;
}
-.ss-list.checkbox .ss-option{
+.ss-list.checkbox .ss-option, .ss-list.checkbox input{
position: relative;
font-weight: lighter;
}
-.ss-list.checkbox .ss-option:before {
+.ss-list.checkbox .ss-option:before, , .ss-list.checkbox input:before {
content: "";
position : absolute;
display: block;
@@ -559,7 +562,7 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
left: -2.5rem;
top: .9rem;
}
-.ss-list.checkbox .ss-option.active:after {
+.ss-list.checkbox .ss-option.active:after, , .ss-list.checkbox input:after {
font-family: "Font Awesome 5 pro";
font-weight: 900;
content: "\f00C";
@@ -695,6 +698,40 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
margin-top: 10rem;
}
+
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXX Home entrepreneur XXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
+.block_aside_entre{
+ background: white;
+ margin-left: 2rem;
+ padding: 1.5rem;
+ text-align: center;
+ p{
+ color: #152935;
+ font-size: 1.4rem;
+ font-weight: bold;
+ margin: 2rem 0 2rem 0;
+ }
+}
+.block-g-entre{
+ background: white;
+ padding: 2rem;
+}
+
+#entrepreneur-resource-list container{
+ padding-top: 3.5rem;
+ input[name="keyword"]{
+ float: left;
+ width: 80%;
+ }
+ input[type="submit"]{
+ float: right;
+ margin-top: 0;
+ }
+}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX LISTE RESSOURCE XXXXXXXXXXXXXXXXXX
@@ -1125,6 +1162,26 @@ cs-display-property[name="mentor_profile.country"] p{
color: var(--bg-block);
cursor: pointer;
}
+
+.button_edit{
+ position: absolute;
+ top: -1rem;
+ right: -2rem;
+ width: 5rem;
+ height: 5rem;
+ border-radius: 50%;
+ background: var(--clr-roll-black);
+ color:white;
+ border: 2px rgba(68,76,77, 0) solid;
+ transition: .4s all ease-in;
+ font-size: 1.4rem;
+ cursor: pointer;
+}
+.button_edit:hover{
+ color: var(--clr-roll-black);
+ background: white;
+ border: 2px rgba(68,76,77, 1) solid;
+}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX MEDIA QUERIES XXXXXXXXXXXXXXXXXXXXX
--
GitLab
From 01dd5293ea6f2a38adc179bffa2e739c031c8284 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Fri, 13 Sep 2019 10:49:21 +0200
Subject: [PATCH 4/4] Fix buttons
---
src/scripts/coopstarter.js | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index ebf57127..6111b607 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -50,14 +50,21 @@ jQuery(document).ready(function($) {
refreshList("refusal-dialog-form", "pending-resources");
refreshList("improvement-dialog-form", "pending-resources");
- const logoutButton = document.getElementById('logout-button');
- logoutButton.addEventListener('click', function() {
+ const logoutButtons = document.getElementsByClassName("logout-button");
+ for (var i = 0; i < logoutButtons.length; i++) {
+ logoutButtons[i].addEventListener("click", function() {
window.dispatchEvent(
- new CustomEvent('requestNavigation', { detail: { route: 'splash-index' } })
+ new CustomEvent("requestNavigation", {
+ detail: { route: "splash-index" }
+ })
);
- document.querySelector('sib-auth').logout();
- setTimeout(function(){ location.reload(); }, 1000);
- })
+ document.querySelector("sib-auth").logout();
+ setTimeout(function() {
+ location.reload();
+ }, 1000);
+ });
+ }
+
//In the entrepreneur dashboard, we set data from the display form to the hidden ones.
let keyword_form = document.getElementById('search-by-keyword');
--
GitLab