autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feature: circle-profile + user-thumb update

Browse Source
This commit is contained in:
gaelle morin 2020-12-06 16:20:33 +01:00
parent 0fb2fc7cf8
commit 9fc095a0cc
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
6 changed files with 67 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/page-circle.pug
View File

@ -1,14 +1,17 @@
.views-container.sidebar-is-closed .views-container.sidebar-is-closed
.content-box.flex.full-width.with-form .content-box
div.content-box__header solid-ac-checker(permission='acl:Read', bind-resources)
solid-ac-checker.flex.space-between(permission='acl:Read', bind-resources) div.segment.padding-large.border-bottom.border-color-grey.clearfix
solid-display( solid-display.text-xxlarge.text-letter-spacing-large(
bind-resources bind-resources
fields='name, description' fields='name, dash, description'
class-name='h1-like' value-dash=' - '
class-description='h1-aside description'
class-name='text-color-heading text-bold'
class-dash='text-color-heading text-bold'
) )
div.segment.lg-hidden
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='circle.menuRight.buttonMobile') button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='circle.menuRight.buttonMobile')
div.content-box__height div.content-box__height
solid-ac-checker(permission='acl:Read', bind-resources) solid-ac-checker(permission='acl:Read', bind-resources)

18
src/styles/hubl-framework/commons/user-thumb.scss
View File

@ -63,17 +63,35 @@
&::before { &::before {
font-size: 15px; font-size: 15px;
} }
&.top-align::before {
vertical-align: super;
margin-top: -10px;
margin-right: 5px;
}
}
.tag {
margin-top: -19px;
} }
} }
.user-thumb-content__sub-text{ .user-thumb-content__sub-text{
display: flex; display: flex;
&.username {
font-size: 12px; font-size: 12px;
&::before { &::before {
content: "@"; content: "@";
} }
} }
&.community {
.icon::before {
font-size: 15px;
}
}
}
} }
} }
} }

2
src/styles/hubl-framework/tags/_index.scss
View File

@ -1,4 +1,4 @@
.tag { .tag:not(:empty) {
cursor: pointer; cursor: pointer;
height: 17px; height: 17px;
font-size: 12px; font-size: 12px;

2
src/views/admin/page-admin-circles.pug
View File

@ -19,7 +19,7 @@
class-content='user-thumb-content' class-content='user-thumb-content'
class-name-and-icon='user-thumb-content__name-and-icon' class-name-and-icon='user-thumb-content__name-and-icon'
class-name='name' class-name='name'
class-sub='user-thumb-content__sub-text' class-sub='user-thumb-content__sub-text username'
class-username='' class-username=''
widget-account.picture='hubl-user-avatar' widget-account.picture='hubl-user-avatar'

2
src/views/admin/page-admin-projects.pug
View File

@ -62,7 +62,7 @@
class-content='user-thumb-content' class-content='user-thumb-content'
class-name-and-icon='user-thumb-content__name-and-icon' class-name-and-icon='user-thumb-content__name-and-icon'
class-name='name' class-name='name'
class-sub='user-thumb-content__sub-text' class-sub='user-thumb-content__sub-text username'
class-username='' class-username=''
widget-account.picture='hubl-user-avatar' widget-account.picture='hubl-user-avatar'

45
src/views/circle/page-circle-profile.pug
View File

@ -8,16 +8,15 @@ solid-router(default-route='circle-profile', hidden)
template template
solid-link(data-src='\${value}', next='messages') solid-link(data-src='\${value}', next='messages')
.content-box__info.flex div.segment.padding-large.clearfix
div#loader-circle-profile.loader div#loader-circle-profile.loader
div div
div div
div div
div div
.flex.space-between.with-padding.mobile-vertical-align div.segment.clearfix
solid-display.mobile-margin__bottom( solid-display.segment.lg-half.float-left(
bind-resources bind-resources
fields='creationDateSet(title, creationDate)' fields='creationDateSet(title, creationDate)'
loader-id='loader-circle-profile' loader-id='loader-circle-profile'
@ -29,28 +28,27 @@ solid-router(default-route='circle-profile', hidden)
widget-creationDate='solid-display-value-date' widget-creationDate='solid-display-value-date'
) )
solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') solid-ac-checker.segment.lg-half.float-left.text-right.margin-bottom-large(permission='acl:Append', bind-resources, nested-field='members')
solid-ac-checker(permission='acl:Delete', bind-resources) solid-ac-checker(permission='acl:Delete', bind-resources)
solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources data-trans='circle.profile.buttonModify') solid-link(class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-pencil' next='circle-edit' bind-resources data-trans='circle.profile.buttonModify')
solid-ac-checker(no-permission='acl:Delete', bind-resources) solid-ac-checker(no-permission='acl:Delete', bind-resources)
solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources data-trans='circle.profile.buttonAdd') solid-link(class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-pencil' next='circle-edit' bind-resources data-trans='circle.profile.buttonAdd')
div.segment.lg-auto.float-right.margin-bottom-large
div.flex.desktop-button__end
solid-ac-checker(permission='acl:Delete', bind-resources) solid-ac-checker(permission='acl:Delete', bind-resources)
solid-delete( solid-delete(
class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash' class='button text-xsmall text-bold text-uppercase color-secondary bordered'
bind-resources bind-resources
data-label='' data-label=''
data-trans='data-label=circle.profile.buttonDelete' data-trans='data-label=circle.profile.buttonDelete'
next='admin-circles' next='admin-circles'
) )
solid-widget(name='hubl-circle-leave-button') solid-widget.segment.lg-auto.float-right.margin-bottom-large(name='hubl-circle-leave-button')
template template
solid-ac-checker(no-permission='acl:Delete', data-src="${src}", nested-field="circle") solid-ac-checker(no-permission='acl:Delete', data-src="${src}", nested-field="circle")
solid-delete( solid-delete(
class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}" data-src="${src}"
data-label='' data-label=''
data-trans='data-label=circle.profile.buttonQuit' data-trans='data-label=circle.profile.buttonQuit'
@ -59,7 +57,7 @@ solid-router(default-route='circle-profile', hidden)
solid-widget(name='hubl-circle-join-button') solid-widget(name='hubl-circle-join-button')
template template
button.button.desktop-btn-margin__left.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex button.button.text-xsmall.text-bold.text-uppercase.reversed.color-secondary.bordered.icon.icon-arrow-right-circle
solid-form( solid-form(
data-src='' data-src=''
nested-field='members' nested-field='members'
@ -86,24 +84,29 @@ solid-router(default-route='circle-profile', hidden)
hubl-inherit-user-id="search-value-user" hubl-inherit-user-id="search-value-user"
) )
h2(data-trans='circle.profile.subTitle') h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.profile.subTitle')
solid-widget(name='hubl-circle-user-admin') solid-widget(name='hubl-circle-user-admin')
template ${value ? "Administrateur" : ""} template ${value ? "Administrateur" : ""}
solid-display.block( solid-display.user-thumb(
bind-resources bind-resources
nested-field='members' nested-field='members'
loader-id='loader-circle-profile' loader-id='loader-circle-profile'
fields='classGroup(user.account.picture, sup(user.name, user, is_admin), sub(user.communities))' fields='user.account.picture, content(name-and-icon(user.name, user, is_admin), sub(atom, user.communities))'
widget-user='hubl-circle-team-contact' widget-user='hubl-circle-team-contact'
class-classGroup='user-thumb is-spaced' class-user.account.picture='user-thumb-avatar'
class-user.account.picture='avatar user-thumb__picture' class-content='user-thumb-content'
class-user.name='user-thumb__name' class-name-and-icon='user-thumb-content__name-and-icon'
class-user='user-thumb__send' class-user.name='name'
class-is_admin='user-thumb__admin' class-user='icon top-align icon-secondary hover icon-speech'
class-is_admin='tag color-primary'
class-sub='user-thumb-content__sub-text community'
class-atom='icon icon-primary mdi-atom'
multiple-user.communities multiple-user.communities
multiple-user.communities-fields="community.name" multiple-user.communities-fields="community.name"