From d70fd6dac8f79bb7410b639f69ec201ae781c552 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 14:27:49 +0200 Subject: [PATCH] fix: new classes added to project-edit + fixbug on table for project- and circle-edit --- src/styles/base/table.scss | 12 ++------- src/views/circle/page-circle-edit.pug | 12 ++++----- src/views/project/page-project-edit.pug | 36 ++++++++++++------------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index e917128..f32d741 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -117,16 +117,8 @@ width: 70px; } - .w262 { - width: 262px; - } - - .W152 { - width: 152px; - } - - .w355 { - width: 355px; + .w162 { + width: 162px; } .hashtag::before { diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index 89e2b8f..82af171 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -8,7 +8,7 @@ div.content-box__info sib-widget(name='hubl-team-template-edit') template sib-display.user-thumb.is-spaced( - class='w355 cell border cell-with-id-card user-thumb' + class='w280 cell border cell-with-id-card user-thumb' data-src='${await value.user}' fields='account.picture, sup(name, groups), sub(profile.city)' @@ -24,7 +24,7 @@ div.content-box__info ) sib-ac-checker( - class='W152 cell border' + class='w162 cell border' permission="acl:Delete" data-src="${value['@id']}" ) @@ -36,7 +36,7 @@ div.content-box__info //- Only to show the table grid sib-ac-checker( - class='W152 cell border' + class='w162 cell border' no-permission="acl:Delete" data-src="${value['@id']}" ) @@ -72,7 +72,7 @@ div.content-box__info next='circle-information' ) - h2 Liste des membres: + h2 Liste des membres : sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members') sib-form.block.select-add( @@ -91,8 +91,8 @@ div.content-box__info .table-wrapper .table div.table-header.grey-color - div.w355 Nom - div.W152 Accès + div.w280 Nom + div.w162 Accès //-class='table-body' sib-display( diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index afefc88..f5e3ad2 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -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="" @@ -33,7 +33,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' @@ -46,18 +46,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' + )