fix: fix bugs due to merge

This commit is contained in:
gaelle morin 2020-05-29 18:12:29 +02:00
parent 8087e679c8
commit 20e27997d6
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
4 changed files with 56 additions and 22 deletions

View File

@ -37,7 +37,8 @@
} }
} }
.table-body, .table-header { .table-body,
.table-header {
>div:first-of-type>sib-display>div, >div:first-of-type>sib-display>div,
hubl-team-template-edit[name='members'] { hubl-team-template-edit[name='members'] {
@ -89,7 +90,8 @@
[name='button'] { [name='button'] {
input[type='submit'] { input[type='submit'] {
@extend .button, @extend
.button,
.text-bold, .text-bold,
.text-uppercase, .text-uppercase,
.reversed, .reversed,
@ -112,6 +114,27 @@
justify-content: center; justify-content: center;
} }
.user-thumb>div
/* for the table in circle-edit and captain's cell in project-admin */
,
[name='user-thumb'] {
@extend %user-thumb__grid;
padding: 0 2.2rem;
>.user-thumb__picture {
@extend .user-thumb__picture;
}
>[name='sup'] {
@extend %user-thumb__grid-sup;
}
>[name='sub'] {
@extend %user-thumb__grid-inf;
}
}
sib-ac-checker { sib-ac-checker {
align-items: center; align-items: center;
display: flex; display: flex;

View File

@ -1,19 +1,26 @@
div.content-box__info.flex div.content-box__info
include ../../templates/hubl-user-avatar.pug include ../../templates/hubl-user-avatar.pug
sib-widget(name='hubl-user-groups')
template ${await value.name}
sib-widget(name='hubl-team-template-edit') sib-widget(name='hubl-team-template-edit')
template template
sib-display.user-thumb( sib-display.user-thumb(
class='w66 cell border cell-with-id-card user-thumb' class='w66 cell border cell-with-id-card user-thumb'
data-src='${await value.user}' data-src='${await value.user}'
fields='account.picture, sup(name), sub(profile.city)' fields='account.picture, sup(name, groups), sub(profile.city)'
class-account.picture='avatar user-thumb__picture' class-account.picture='user-thumb__picture avatar'
class-name='user-thumb__name' class-name='user-thumb__name'
class-groups='user-thumb__groups'
class-profile.city='user-thumb__city' class-profile.city='user-thumb__city'
widget-account.picture='hubl-user-avatar' widget-account.picture='hubl-user-avatar'
multiple-groups=''
widget-groups='hubl-user-groups'
) )
sib-ac-checker( sib-ac-checker(
@ -46,15 +53,17 @@ div.content-box__info.flex
range-owner=`${endpoints.users || endpoints.get.users}` range-owner=`${endpoints.users || endpoints.get.users}`
label-status='Statut du canal' label-status='Statut du canal'
widget-status='hubl-status'
label-name='Nom du canal' label-name='Nom du canal'
label-owner='Administrateur ou administratrice' label-owner='Administrateur ou administratrice'
label-description='Sous-titre du canal *' label-description='Sous-titre du canal *'
class-name='form-label is-light is-half-width input-text-like' class-name='form-label is-light is-half-width input-text-like'
class-owner='form-label is-light is-half-width color' class-owner='form-label is-light is-half-width member-select color'
class-description='form-label is-light is-full-width input-text-like' class-description='form-label is-light is-full-width input-text-like'
class-status='form-label is-light is-full-width member-select color'
widget-status='hubl-status'
widget-owner='sib-form-auto-completion' widget-owner='sib-form-auto-completion'
partial='' partial=''
@ -66,13 +75,13 @@ div.content-box__info.flex
h2 Liste des membres: h2 Liste des membres:
sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members') sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
sib-form.block.select-add.button-add( sib-form.block.select-add(
bind-resources bind-resources
nested-field='members' nested-field='members'
fields='user' fields='user'
range-user=`${endpoints.users || endpoints.get.users}` range-user=`${endpoints.users || endpoints.get.users}`
class-user='team form-label is-dark' class-user='team form-label is-light'
label-user='' label-user=''
widget-user='sib-form-auto-completion' widget-user='sib-form-auto-completion'

View File

@ -4,7 +4,7 @@ sib-router(default-route='circle-profile', hidden)
#circle-profile(hidden) #circle-profile(hidden)
include ../../templates/hubl-circle-team.pug include ../../templates/hubl-circle-team.pug
.content-box__info.flex .content-box__info
.flex.space-between .flex.space-between
sib-display( sib-display(
@ -21,16 +21,6 @@ sib-router(default-route='circle-profile', hidden)
sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre
h2 Membres :
sib-display.block(
bind-resources
fields='members'
multiple-members=''
widget-members='hubl-circle-team-template'
)
div.flex.button-end div.flex.button-end
sib-ac-checker(permission='acl:Delete', bind-resources) sib-ac-checker(permission='acl:Delete', bind-resources)
sib-delete( sib-delete(
@ -78,5 +68,17 @@ sib-router(default-route='circle-profile', hidden)
hubl-inherit-user-id="search-value-user" hubl-inherit-user-id="search-value-user"
) )
h2 Membres :
sib-display.block(
bind-resources
fields='members'
multiple-members=''
widget-members='hubl-circle-team-template'
)
#circle-edit(hidden) #circle-edit(hidden)
include page-circle-edit.pug include page-circle-edit.pug

View File

@ -56,8 +56,8 @@ div.content-box__info.flex
.table .table
div.table-header.grey-color div.table-header.grey-color
div Nom div.w66 Nom
div Accès div.w33 Accès
//-class='table-body' //-class='table-body'
sib-display( sib-display(