update: groups removed

This commit is contained in:
gaelle morin 2020-05-13 10:16:00 +02:00
parent ef8ad357f7
commit cf30a0e363
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
13 changed files with 5 additions and 69 deletions

View File

@ -78,8 +78,6 @@
/* tags */ /* tags */
--color-tag-admin-text: var(--color-complementary); --color-tag-admin-text: var(--color-complementary);
--color-tag-admin-border: var(--color-complementary); --color-tag-admin-border: var(--color-complementary);
--color-tag-group-text: var(--color-primary);
--color-tag-group-border: var(--color-primary);
/* Form elements */ /* Form elements */
--color-button-white: var(--color-white); --color-button-white: var(--color-white);

View File

@ -127,10 +127,6 @@
.user-thumb__name { .user-thumb__name {
@extend %user-thumb__name; @extend %user-thumb__name;
} }
.user-thumb__groups {
@extend %user-thumb__groups;
}
} }
>[name='sub'] { >[name='sub'] {

View File

@ -57,17 +57,6 @@
margin-right: 1rem; margin-right: 1rem;
} }
%user-thumb__groups {
display: flex;
margin-bottom: 1px;
margin-left: 0.6rem;
[name='groups'],
[name='user.groups'] {
@extend %tag-role;
}
}
%user-thumb__admin { %user-thumb__admin {
@extend %tag-admin; @extend %tag-admin;
} }

View File

@ -1,13 +1,3 @@
%tag-role {
border: 1px solid var(--color-tag-group-border);
border-radius: 3px;
color: var(--color-tag-group-text);
font-size: 1.4rem;
font-weight: 400;
margin-right: 0.6rem;
padding: 0.2rem 0.98rem;
}
%tag-admin { %tag-admin {
border: 1px solid var(--color-tag-admin-border); border: 1px solid var(--color-tag-admin-border);
border-radius: 3px; border-radius: 3px;
@ -16,4 +6,4 @@
font-weight: 400; font-weight: 400;
margin-left: 0.6rem; margin-left: 0.6rem;
padding: 0.35rem 0.98rem; padding: 0.35rem 0.98rem;
} }

View File

@ -22,10 +22,6 @@
@extend %user-thumb__name; @extend %user-thumb__name;
} }
.tag-group {
@extend %user-thumb__groups;
}
.tag-admin:not(:empty) { .tag-admin:not(:empty) {
@extend %tag-admin; @extend %tag-admin;
} }

View File

@ -64,10 +64,6 @@
@extend %user-thumb__name; @extend %user-thumb__name;
} }
sib-multiple {
@extend %user-thumb__groups;
}
.tag-admin:not(:empty) { .tag-admin:not(:empty) {
@extend %tag-admin; @extend %tag-admin;
} }

View File

@ -4,24 +4,17 @@ sib-widget(name='hubl-circle-team-template')
template template
sib-display.user-thumb( sib-display.user-thumb(
data-src='${await value.user}' data-src='${await value.user}'
fields='account.picture, sup(name, isadmin, groups), sub(profile.city)' fields='account.picture, sup(name, isadmin), sub(profile.city)'
value-isadmin='${await value.is_admin}' value-isadmin='${await value.is_admin}'
class-account.picture='user-thumb__picture' class-account.picture='user-thumb__picture'
class-name='user-thumb__name' class-name='user-thumb__name'
class-isadmin='tag-admin' class-isadmin='tag-admin'
class-groups='tag-group'
class-profile.city='user-thumb__city' class-profile.city='user-thumb__city'
widget-account.picture='hubl-user-avatar' widget-account.picture='hubl-user-avatar'
widget-isadmin='hubl-circle-user-admin' widget-isadmin='hubl-circle-user-admin'
widget-groups='hubl-circle-user-groups'
multiple-groups=''
) )
sib-widget(name='hubl-circle-user-admin') sib-widget(name='hubl-circle-user-admin')
template ${(await value) != "false" ? "Administrateur" : ""} template ${(await value) != "false" ? "Administrateur" : ""}
sib-widget(name='hubl-circle-user-groups')
template ${await value.name}

View File

@ -1,3 +1,4 @@
//- to be deleted when correcting user-profile
sib-widget(name='hubl-groups-name') sib-widget(name='hubl-groups-name')
template ${value.name} template ${value.name}

View File

@ -4,26 +4,19 @@ sib-widget(name='hubl-project-team')
template template
sib-display.user-thumb( sib-display.user-thumb(
data-src='${await value}' data-src='${await value}'
fields='user.account.picture, sup(user.name, isadmin, user.groups), sub(user.profile.city, name)' fields='user.account.picture, sup(user.name, isadmin), sub(user.profile.city, name)'
value-isadmin='${await value.is_admin}' value-isadmin='${await value.is_admin}'
class-user.account.picture='user-thumb__picture' class-user.account.picture='user-thumb__picture'
class-user.name='user-thumb__name' class-user.name='user-thumb__name'
class-isadmin='tag-admin' class-isadmin='tag-admin'
class-user.groups='tag-group'
class-user.profile.city='user-thumb__city' class-user.profile.city='user-thumb__city'
class-name='user-thumb__lead' class-name='user-thumb__lead'
widget-user.account.picture='hubl-user-avatar' widget-user.account.picture='hubl-user-avatar'
widget-isadmin='hubl-project-user-admin' widget-isadmin='hubl-project-user-admin'
widget-user.groups='hubl-project-user-groups'
multiple-user.groups=''
) )
sib-widget(name='hubl-project-user-admin') sib-widget(name='hubl-project-user-admin')
template ${(await value) == "false" ? "" : "Administrateur"} template ${(await value) == "false" ? "" : "Administrateur"}
sib-widget(name='hubl-project-user-groups')
template ${await value.name}

View File

@ -5,7 +5,6 @@ div.content-box__info
sib-form.button-register( sib-form.button-register(
data-src=`${endpoints.users || endpoints.post.users}` data-src=`${endpoints.users || endpoints.post.users}`
range-groups=`${endpoints.groups || endpoints.get.groups}`
fields='line-1(first_name, last_name), line-2(username, email), line-3(password)' fields='line-1(first_name, last_name), line-2(username, email), line-3(password)'

View File

@ -10,7 +10,6 @@ div.content-box__info
sib-form.button-register( sib-form.button-register(
bind-resources='' bind-resources=''
range-groups=`${endpoints.groups || endpoints.get.groups}`
fields='line-1(first_name, last_name), line-2(username, email)' fields='line-1(first_name, last_name), line-2(username, email)'

View File

@ -16,13 +16,6 @@
next="${value}" next="${value}"
) )
sib-widget(name='hubl-user-admin-groups-display')
template
sib-display(
data-src="${value}"
fields="name"
)
#admin-users-list(hidden) #admin-users-list(hidden)
div.content-box__info div.content-box__info

View File

@ -2,25 +2,18 @@ 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, groups), sub(profile.city)' fields='account.picture, sup(name), sub(profile.city)'
class-account.picture='user-thumb__picture' class-account.picture='user-thumb__picture'
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(