From 020f97c9559b11fade3e481745f35f87885a7f64 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 10 Dec 2020 13:52:10 +0100 Subject: [PATCH] feature: project-profile --- src/styles/hubl-framework/commons/texts.scss | 8 +++ .../hubl-framework/commons/user-thumb.scss | 2 + src/styles/hubl-framework/tags/_index.scss | 1 - src/templates/hubl-captain.pug | 20 ++++--- src/views/project/page-project-profile.pug | 54 +++++++++---------- 5 files changed, 48 insertions(+), 37 deletions(-) diff --git a/src/styles/hubl-framework/commons/texts.scss b/src/styles/hubl-framework/commons/texts.scss index 1b2e856..a1d6807 100644 --- a/src/styles/hubl-framework/commons/texts.scss +++ b/src/styles/hubl-framework/commons/texts.scss @@ -46,3 +46,11 @@ text-align: right; } } + +.word-spacing-left { + margin-left: 0.60rem; +} + +.word-spacing-right { + margin-right: 0.60rem; +} diff --git a/src/styles/hubl-framework/commons/user-thumb.scss b/src/styles/hubl-framework/commons/user-thumb.scss index 69a83a9..145b5df 100644 --- a/src/styles/hubl-framework/commons/user-thumb.scss +++ b/src/styles/hubl-framework/commons/user-thumb.scss @@ -59,6 +59,7 @@ .icon { margin-left: 10px; + cursor: pointer; &::before { font-size: 15px; @@ -89,6 +90,7 @@ &.community { .icon::before { font-size: 15px; + margin-top: 1px; } } } diff --git a/src/styles/hubl-framework/tags/_index.scss b/src/styles/hubl-framework/tags/_index.scss index 704e4be..eb2fc2b 100644 --- a/src/styles/hubl-framework/tags/_index.scss +++ b/src/styles/hubl-framework/tags/_index.scss @@ -1,6 +1,5 @@ .tag:not(:empty) { cursor: pointer; - height: 17px; font-size: 12px; letter-spacing: 0.24px; line-height: 17px; diff --git a/src/templates/hubl-captain.pug b/src/templates/hubl-captain.pug index 5a5248c..f9b764d 100644 --- a/src/templates/hubl-captain.pug +++ b/src/templates/hubl-captain.pug @@ -4,13 +4,21 @@ solid-widget(name='hubl-captain') template solid-display.user-thumb( data-src="${await value}" - fields='account.picture, sup(name), sub(is_lead)' + fields='account.picture, content(name-and-icon(name, user, is_lead), sub(atom, communities))' - class-account.picture='avatar user-thumb__picture' - class-name='user-thumb__name' - class-is_lead='user-thumb__lead' + class-account.picture='user-thumb-avatar' + class-content='user-thumb-content' + class-name-and-icon='user-thumb-content__name-and-icon' + class-name='name' + class-user='icon top-align icon-secondary hover icon-speech' + class-sub='user-thumb-content__sub-text community' + class-atom='icon icon-third mdi-atom' + + multiple-communities + multiple-communities-fields='community.name' widget-account.picture='hubl-user-avatar' - value-is_lead='' - data-trans='value-is_lead=template-captain.isLead' ) + + //- To remove from translate file : + data-trans='value-is_lead=template-captain.isLead' diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index 879a80e..935dc55 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -53,15 +53,15 @@ solid-router(default-route='project-profile', hidden) solid-ac-checker(no-permission='acl:Delete', bind-resources) solid-link(class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-pencil' next='project-edit' bind-resources data-trans='project.profile.buttonAdd') - div.segment.lg-auto.float-right.margin-bottom-large - solid-ac-checker(permission='acl:Delete', bind-resources) - solid-delete( - class='button text-xsmall text-bold text-uppercase color-secondary bordered' - bind-resources - data-label='' - data-trans='data-label=project.profile.buttonDelete' - next='admin-projects' - ) + div.segment.lg-auto.float-right.margin-bottom-large + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-delete( + class='button text-xsmall text-bold text-uppercase color-secondary bordered' + bind-resources + data-label='' + data-trans='data-label=project.profile.buttonDelete' + next='admin-projects' + ) solid-widget.segment.lg-auto.float-right.margin-bottom-large(name='hubl-project-leave-button') template @@ -89,43 +89,37 @@ solid-router(default-route='project-profile', hidden) hubl-inherit-user-id="search-value-user" ) - .flex.space-between - solid-display( - bind-resources - fields='label-captain, captain' - - value-label-captain='' - data-trans='value-label-captain=project.profile.captain', - class-label-captain='h2-like' - widget-captain='hubl-captain' - ) + h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans:'project.profile.subTitle') + solid-display( + bind-resources + fields='captain' + widget-captain='hubl-captain' + ) br h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans:'project.profile.subTitle') - solid-widget(name='hubl-project-user-admin') - template ${value ? "Administrateur" : ""} - solid-display.user-thumb( bind-resources nested-field='members' - fields='classGroup(user.account.picture, sup(user.name, user, is_admin), sub(user.communities, name))' + fields='user.account.picture, content(name-and-icon(user.name, user), sub(atom, user.communities, name))' widget-user='hubl-project-team-contact' - class-classGroup='user-thumb is-spaced' - class-user.account.picture='avatar user-thumb__picture' - class-user.name='user-thumb__name' - class-user='user-thumb__send' - class-is_admin='user-thumb__admin' + class-user.account.picture='user-thumb-avatar' + class-content='user-thumb-content' + class-name-and-icon='user-thumb-content__name-and-icon' + class-user.name='name' + class-user='icon top-align icon-secondary hover icon-speech' + class-sub='user-thumb-content__sub-text community' + class-atom='icon icon-third mdi-atom' + multiple-user.communities multiple-user.communities-fields="community.name" - class-name='user-thumb__lead' widget-classGroup='solid-set-div' widget-user.account.picture='hubl-user-avatar' - widget-is_admin='hubl-project-user-admin' ) #project-edit.content-box__height(hidden, data-view="project-edit")