Merge branch 'feature/fix-from-rework-css' of git.startinblox.com:applications/hubl into release/0.10

This commit is contained in:
Jean-Baptiste Pasquier
2020-06-18 17:04:16 +02:00
8 changed files with 194 additions and 153 deletions

View File

@ -9,20 +9,20 @@ div.content-box__info
sib-form.form.button-register(
bind-resources
fields='status, block-project__info(customer.name, name), description'
fields='status, line-1(customer.name, name), description'
label-status='Statut du canal*'
widget-status='hubl-status'
class-status='form-label is-light is-full-width member-select color'
label-name='Nom du projet*'
class-name='form-label is-light is-half-width'
class-name='form-label is-light is-half-width input-text-like'
label-customer.name='Nom du client*'
class-customer.name='form-label is-light is-half-width'
class-customer.name='form-label is-light is-half-width input-text-like'
label-description='Description du projet'
class-description='form-label is-light is-full-width'
class-description='form-label is-light is-full-width input-text-like'
widget-description='sib-form-textarea'
partial=""
@ -43,7 +43,7 @@ div.content-box__info
h2 Liste des membres :
sib-form.block.select-add.button-add(
sib-form.block.select-add(
bind-resources
nested-field='members'
fields='user'
@ -56,18 +56,18 @@ div.content-box__info
submit-button='Ajouter un membre'
)
.table
.table-wrapper
.table
div.table-header.grey-color
div.w280 Nom
div.w162 Accès
div.table-header.grey-color
div.w66 Nom
div.w33 Accès
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
multiple-members=''
widget-members='hubl-team-template-edit'
)
multiple-members=''
widget-members='hubl-team-template-edit'
)

View File

@ -21,10 +21,10 @@ sib-router(default-route='project-profile', hidden)
widget-creationDate='sib-display-date'
)
sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
sib-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
sib-display(
class='position-end'
class='flex desktop-button__end'
bind-resources
nested-field='members'
fields='relation'
@ -39,7 +39,7 @@ sib-router(default-route='project-profile', hidden)
hubl-inherit-user-id="search-value-user"
)
.space-between
.flex.space-between
sib-display(
bind-resources
fields='label-captain, captain'
@ -58,12 +58,12 @@ sib-router(default-route='project-profile', hidden)
h2 Equipe :
sib-display(
sib-display.block(
bind-resources
fields='members'
widget-members='hubl-project-team'
multiple-members
widget-members='hubl-project-team'
)