From 3042c8efe2377b4b96557a50617eb966600aca5e Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 22 Jan 2020 16:08:53 +0100 Subject: [PATCH] project: admin tag displayed when it is needed + some CSS --- src/styles/components/tags.scss | 1 + src/styles/layout/project-profile/project-profile.scss | 4 ++++ src/templates/hd-project-team.pug | 9 +++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/styles/components/tags.scss b/src/styles/components/tags.scss index 6fb27df..f5435c2 100644 --- a/src/styles/components/tags.scss +++ b/src/styles/components/tags.scss @@ -15,5 +15,6 @@ font-size: 1.4rem; font-weight: 400; margin-left: 0.6rem; + margin-top: -2px; padding: 0.3rem 0.98rem; } \ No newline at end of file diff --git a/src/styles/layout/project-profile/project-profile.scss b/src/styles/layout/project-profile/project-profile.scss index 8df4271..ab8f6cb 100644 --- a/src/styles/layout/project-profile/project-profile.scss +++ b/src/styles/layout/project-profile/project-profile.scss @@ -107,6 +107,10 @@ @extend %tag-role; } } + + .tag-admin:not(:empty) { + @extend %tag-admin; + } } >[name='sub'] { diff --git a/src/templates/hd-project-team.pug b/src/templates/hd-project-team.pug index 8fd2458..ff0616f 100644 --- a/src/templates/hd-project-team.pug +++ b/src/templates/hd-project-team.pug @@ -4,22 +4,23 @@ sib-widget(name='hd-project-team') template sib-display( data-src='${await value}' - fields='user.account.picture, sup(user.name, is_admin, user.groups), sub(user.profile.city, name)' + fields='user.account.picture, sup(user.name, isadmin, user.groups), sub(user.profile.city, name)' + value-isadmin='${await value.is_admin}' class-user.name='user-name' - class-is_admin='tag-admin' + class-isadmin='tag-admin' class-user.groups='tag-group' class-user.profile.city='city' widget-user.account.picture='hd-user-avatar' - widget-is_admin='hd-project-user-admin' + widget-isadmin='hd-project-user-admin' widget-user.groups='hd-project-user-groups' multiple-user.groups='' ) sib-widget(name='hd-project-user-admin') - template ${await value ? "Administrator" : ""} + template ${(await value) == "false" ? "" : "Administrator"} sib-widget(name='hd-project-user-groups') template ${await value.name}