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

This commit is contained in:
Gaelle Morin 2018-12-13 14:55:15 +01:00
commit 3ce3ac151b
4 changed files with 11 additions and 9 deletions

View File

@ -29,11 +29,11 @@ link(href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,6
// Web components // Web components
//- local //- local
//- link(rel='import', href='/lib/sib-core/sib-display.html') link(rel='import', href='/lib/sib-core/sib-display.html')
link(rel='import', href='/lib/sib-router/sib-router.html') // link(rel='import', href='/lib/sib-router/sib-router.html')
link(rel='import', href='/lib/sib-chat/sib-chat.html') // link(rel='import', href='/lib/sib-chat/sib-chat.html')
//- cdn //- cdn
link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html") // link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
link(rel='import', href="https://cdn.happy-dev.fr/sib-router/sib-router.html") link(rel='import', href="https://cdn.happy-dev.fr/sib-router/sib-router.html")
link(rel='import', href="https://cdn.happy-dev.fr/sib-chat/sib-chat.html") link(rel='import', href="https://cdn.happy-dev.fr/sib-chat/sib-chat.html")

View File

@ -11,7 +11,6 @@ div.grid-layer
set-header='picture, user, pseudonym, bio, send, city, country', set-header='picture, user, pseudonym, bio, send, city, country',
set-infos='cell, roles, user.email, foaf:homepage, skills', set-infos='cell, roles, user.email, foaf:homepage, skills',
set-pseudonym='before-pseudo,pseudo' set-pseudonym='before-pseudo,pseudo'
label-skills='skill',
value-before-pseudo='@', value-before-pseudo='@',
value-more='read more...', value-more='read more...',
template-more='hdapp-link-more', template-more='hdapp-link-more',
@ -23,9 +22,12 @@ div.grid-layer
widget-roles='sib-display-lookuplist', widget-roles='sib-display-lookuplist',
widget-skills='sib-display-lookuplist', widget-skills='sib-display-lookuplist',
set-name='pseudo,user.first_name,user.last_name', set-name='pseudo,user.first_name,user.last_name',
search-fields='name, skills, user.groups', search-fields='name, skills, roles',
search-range-skills=`${sdn}/skills/`, search-range-skills=`${sdn}/skills/`,
search-range-user.groups=`${sdn}/group/`, search-range-roles=`${sdn}/role/`,
search-label-skills='competences',
search-label-name='nom, prenom, pseudo',
search-widget-name='sib-form-placeholder-text',
next='member') next='member')
div.grid-layer-links.containerV div.grid-layer-links.containerV
div.containerH.containerCenter.how-link div.containerH.containerCenter.how-link

@ -1 +1 @@
Subproject commit 90d8772af806d1d2345272e4f309cd496c07d56f Subproject commit da21d36eed22e1ad4d4886f26deb0b60abc58c06

@ -1 +1 @@
Subproject commit 5be7c64588b25ba63394f99f03ff19ee6e0c6644 Subproject commit 2d78d30a691f937a5b2cd64cdc40d1fba8a75835