Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app into staging

This commit is contained in:
Gaëlle Morin 2019-05-17 18:25:34 +02:00
commit 3b2f43d1c3
9 changed files with 20 additions and 12 deletions

View File

@ -20,5 +20,5 @@ script(type="module" src="https://unpkg.com/@startinblox/router@0.7.2")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1.7")
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.1.12")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2.1")
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.15")
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.16")

View File

@ -11,15 +11,13 @@ sib-notifications(
bind-user
)
sib-widget(name="user-picture")
template
img(name="${name}",src="\${value || '/images/user.jpg'}",style="max-width:100%; max-height: 100%;")
include templates/hd-user-avatar.pug
details#user-controls
summary(tabindex='0' role='button')
sib-display#user-controls__profile(
data-fields='first_name, account.picture',
widget-account.picture='user-picture',
widget-account.picture='hd-user-avatar',
bind-user
)
#user-controls__panel

View File

@ -12,18 +12,22 @@
sib-form.block(
data-src=`${sdn}/job-offers/`,
range-skills= `${sdn}/skills/`,
range-author= `${sdn}/users/`,
range-skills=`${sdn}/skills/`,
data-fields='title, title-text, description, description-text, skills',
label-title='Title*',
label-description='Description*',
label-skills='The required skills for this mission:*',
widget-title-text='title-text',
label-description='Description*',
widget-description-text='description-text',
label-skills='The required skills for this mission:*',
multiple-skills='sib-multiple-select',
widget-skills='sib-form-auto-completion',
next="job-offers"
)

View File

@ -1,5 +1,6 @@
div.job-offers__main
include templates/hd-user-avatar.pug
include templates/template-groups.pug
include templates/template-skills.pug
include templates/template-joboffers-filter.pug
@ -12,7 +13,7 @@ div.job-offers__main
data-fields='user-thumb, creationDate, title, description, skills, send',
set-user-thumb='author.account.picture, author.first_name, author.groups',
widget-author.account.picture='sib-display-img',
widget-author.account.picture='hd-user-avatar',
widget-author.groups='groups-name',
multiple-author.groups,

View File

@ -87,7 +87,7 @@
}
}
sib-display-img {
hd-user-avatar {
background-color: $color-0-0-100;
border-radius: 50%;
height: 4.25rem;

View File

@ -0,0 +1,3 @@
sib-widget(name='hd-user-avatar')
template
img(name="${name}",src="\${value || '/images/alien.jpg'}",style="max-width:100%; max-height: 100%;")

View File

@ -1,9 +1,11 @@
include hd-user-avatar.pug
sib-widget(name='team-template')
template
sib-display(
data-src="${value.user['@id']}"
data-fields='account.picture',
widget-account.picture='sib-display-img'
widget-account.picture='hd-user-avatar'
)
div(name='user.thumb')
span ${value.user.name}

BIN
www/images/alien.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB