diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index 128f74b..427959e 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -1,11 +1,8 @@ /*#circle-information, #circle-edit, -#admin-circle-list, #admin-circle-create, #project-edit, -#admin-project-list, -#admin-project-create, -#admin-users-list*/ +#admin-project-create*/ [widget="hubl-team-template-edit"]>div { flex: 1; @@ -112,16 +109,20 @@ display: table-cell; } - .w75 { - width: 280px; + .w786 { + width: 786px; } - .w25 { - width: 70px; + .w262 { + width: 262px; } - .w33 { - width: 256px; + .w349 { + width: 349px; + } + + .w698 { + width: 698px; } /*.w25 { diff --git a/src/styles/layout/user/admin-users.scss b/src/styles/layout/user/admin-users.scss index ddf18e7..eb9b939 100644 --- a/src/styles/layout/user/admin-users.scss +++ b/src/styles/layout/user/admin-users.scss @@ -1,6 +1,6 @@ /* Fix. Could disappear when we can add .class on set fields */ sib-set-default[name='cell-1'] { - @extend .w75; + @extend .w786; @extend .cell; @extend .border; } \ No newline at end of file diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index 2a9e86b..f15e295 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -42,9 +42,9 @@ .table div.table-header.grey-color - div.w33 Nom - div.w33 Administrateurs - div.w33 Rejoindre + div.w349 Nom + div.w349 Administrateurs + div.w349 Rejoindre sib-widget(name='hubl-admin-circle-leave-button') template @@ -61,9 +61,9 @@ nested-field='circles' fields='circle.name, circle.owner, leaveButton' - class-circle.name='w33 cell border cell-with-name' - class-circle.owner='w33 cell border cell-with-id-card' - class-leaveButton='w33 cell border cell-with-buttons' + class-circle.name='w349 cell border cell-with-name' + class-circle.owner='w349 cell border cell-with-id-card' + class-leaveButton='w349 cell border cell-with-buttons' action-leaveButton="joinButton" widget-leaveButton="hubl-admin-circle-leave-button" @@ -90,11 +90,11 @@ data-src=`${endpoints.circles || endpoints.get.circles}joinable/` fields='name, owner, members' - class-name='w33 cell border cell-with-name' - class-owner='w33 cell border cell-with-id-card' + class-name='w349 cell border cell-with-name' + class-owner='w349 cell border cell-with-id-card' widget-owner='hubl-circle-owner' - class-members='w33 cell border cell-with-buttons' + class-members='w349 cell border cell-with-buttons' widget-members="hubl-admin-circle-join-button" order-by="name" diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index c201176..e4029db 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -22,13 +22,13 @@ next='admin-project-create' ) Créer un projet - .gridjs-wrapper + .table-wrapper .table div.table-header.grey-color - div.w25 Nom - div.w25 Administrateurs - div.w25 Capitaines - div.w25 Accès + div.w262 Nom + div.w262 Administrateurs + div.w262 Capitaines + div.w262 Accès sib-widget(name="hubl-admin-project-leave-button") template @@ -82,10 +82,10 @@ data-src=`${endpoints.projects || endpoints.get.projects}` fields='name, members, captain, buttons' - class-name='w25 cell border cell-with-name hashtag' - class-members='w25 cell border' - class-captain='w25 cell border cell-with-id-card' - class-buttons='w25 cell border cell-with-buttons' + class-name='w262 cell border cell-with-name hashtag' + class-members='w262 cell border' + class-captain='w262 cell border cell-with-id-card' + class-buttons='w262 cell border cell-with-buttons' widget-buttons="admin-project-buttons" action-buttons="buttons" diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug index 67f2209..66c0c94 100644 --- a/src/views/admin/page-admin-users.pug +++ b/src/views/admin/page-admin-users.pug @@ -31,8 +31,8 @@ .table-wrapper .table div.table-header.grey-color - div.w75 Nom - div.w25 + div.w786 Nom + div.w262 sib-display( class='table-body' @@ -47,7 +47,7 @@ label-actions='Edit' action-actions='admin-users-edit' - class-actions='w25 cell border cell-with-buttons' + class-actions='w262 cell border cell-with-buttons' widget-actions='hubl-sib-action-custom' order-by='username' diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index ad467e4..6092010 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( - class='w66 cell border cell-with-id-card user-thumb' + class='w698 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='w33 cell border' + class='w349 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='w33 cell border' + class='w349 cell border' no-permission="acl:Delete" data-src="${value['@id']}" ) @@ -88,19 +88,20 @@ div.content-box__info submit-button='Ajouter un membre' ) - .table + .table-wrapper + .table + div.table-header.grey-color + div.w698 Nom + div.w349 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' - ) + class-members='w698' + multiple-members='' + widget-members='hubl-team-template-edit' + ) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index fe00957..3e1b992 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -56,8 +56,8 @@ div.content-box__info.flex .table div.table-header.grey-color - div.w66 Nom - div.w33 Accès + div.w698 Nom + div.w349 Accès //-class='table-body' sib-display(