fix: fix bugs due to merge
This commit is contained in:
		| @ -37,7 +37,8 @@ | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     .table-body, .table-header { | ||||
|     .table-body, | ||||
|     .table-header { | ||||
|  | ||||
|       >div:first-of-type>sib-display>div, | ||||
|       hubl-team-template-edit[name='members'] { | ||||
| @ -89,7 +90,8 @@ | ||||
|       [name='button'] { | ||||
|  | ||||
|         input[type='submit'] { | ||||
|           @extend .button, | ||||
|           @extend | ||||
|           .button, | ||||
|           .text-bold, | ||||
|           .text-uppercase, | ||||
|           .reversed, | ||||
| @ -112,6 +114,27 @@ | ||||
|       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 { | ||||
|       align-items: center; | ||||
|       display: flex; | ||||
|  | ||||
| @ -1,19 +1,26 @@ | ||||
| div.content-box__info.flex | ||||
| div.content-box__info | ||||
|  | ||||
|   include ../../templates/hubl-user-avatar.pug | ||||
|  | ||||
|   sib-widget(name='hubl-user-groups') | ||||
|     template ${await value.name} | ||||
|  | ||||
|   sib-widget(name='hubl-team-template-edit') | ||||
|     template | ||||
|       sib-display.user-thumb( | ||||
|         class='w66 cell border cell-with-id-card user-thumb' | ||||
|         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-groups='user-thumb__groups' | ||||
|         class-profile.city='user-thumb__city' | ||||
|  | ||||
|         widget-account.picture='hubl-user-avatar' | ||||
|  | ||||
|         multiple-groups='' | ||||
|         widget-groups='hubl-user-groups' | ||||
|       ) | ||||
|  | ||||
|       sib-ac-checker( | ||||
| @ -46,15 +53,17 @@ div.content-box__info.flex | ||||
|       range-owner=`${endpoints.users || endpoints.get.users}` | ||||
|  | ||||
|       label-status='Statut du canal' | ||||
|       widget-status='hubl-status' | ||||
|  | ||||
|       label-name='Nom du canal' | ||||
|       label-owner='Administrateur ou administratrice' | ||||
|       label-description='Sous-titre du canal *' | ||||
|  | ||||
|       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-status='form-label is-light is-full-width member-select color' | ||||
|  | ||||
|       widget-status='hubl-status' | ||||
|       widget-owner='sib-form-auto-completion' | ||||
|  | ||||
|       partial='' | ||||
| @ -66,13 +75,13 @@ div.content-box__info.flex | ||||
|   h2 Liste des membres: | ||||
|  | ||||
|   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  | ||||
|       nested-field='members' | ||||
|       fields='user' | ||||
|       range-user=`${endpoints.users || endpoints.get.users}` | ||||
|  | ||||
|       class-user='team form-label is-dark' | ||||
|       class-user='team form-label is-light' | ||||
|       label-user='' | ||||
|       widget-user='sib-form-auto-completion' | ||||
|  | ||||
|  | ||||
| @ -4,7 +4,7 @@ sib-router(default-route='circle-profile', hidden) | ||||
|  | ||||
| #circle-profile(hidden) | ||||
|   include ../../templates/hubl-circle-team.pug | ||||
|   .content-box__info.flex | ||||
|   .content-box__info | ||||
|  | ||||
|     .flex.space-between | ||||
|       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 | ||||
|  | ||||
|  | ||||
|     h2 Membres : | ||||
|  | ||||
|     sib-display.block( | ||||
|       bind-resources | ||||
|       fields='members' | ||||
|  | ||||
|       multiple-members='' | ||||
|       widget-members='hubl-circle-team-template' | ||||
|     ) | ||||
|  | ||||
|     div.flex.button-end | ||||
|       sib-ac-checker(permission='acl:Delete', bind-resources) | ||||
|         sib-delete( | ||||
| @ -78,5 +68,17 @@ sib-router(default-route='circle-profile', hidden) | ||||
|         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) | ||||
|   include page-circle-edit.pug | ||||
|  | ||||
| @ -56,8 +56,8 @@ div.content-box__info.flex | ||||
|   .table | ||||
|  | ||||
|     div.table-header.grey-color | ||||
|       div Nom | ||||
|       div Accès | ||||
|       div.w66 Nom | ||||
|       div.w33 Accès | ||||
|  | ||||
|     //-class='table-body' | ||||
|     sib-display( | ||||
|  | ||||
		Reference in New Issue
	
	Block a user