minor: core@beta

This commit is contained in:
Jean-Baptiste Pasquier
2020-09-14 15:41:10 +02:00
parent 7f4115de40
commit ee29fa3e7c
16 changed files with 116 additions and 201 deletions

View File

@ -40,7 +40,7 @@ div.content-box__info.flex
label-captain='Capitaine du projet*'
range-captain=`${endpoints.users || endpoints.get.users}`
class-captain='form-label is-light is-half-width'
widget-captain='solid-form-auto-completion'
widget-captain='solid-form-dropdown-autocompletion-label'
class='input-text-like'

View File

@ -5,42 +5,15 @@ div.content-box__info
solid-widget(name='hubl-user-groups')
template ${await value.name}
solid-widget(name='hubl-team-template-edit')
solid-widget(name="circle-edit-members-delete")
template
solid-display.user-thumb.is-spaced(
class='w280 cell border cell-with-id-card user-thumb'
data-src='${await value.user}'
fields='account.picture, sup(name, groups), sub(profile.city)'
class-account.picture='user-thumb__picture avatar'
class-name='user-thumb__name'
class-groups='user-thumb__groups'
class-profile.city='user-thumb__city'
widget-account.picture='hubl-user-avatar'
multiple-groups=''
widget-groups='hubl-user-groups'
)
solid-ac-checker(
class='w162 cell border'
permission="acl:Delete"
data-src="${value['@id']}"
)
solid-ac-checker(permission="acl:Delete" data-src="${src}")
solid-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${value['@id']}"
data-src="${src}"
data-label='Retirer'
)
//- Only to show the table grid
solid-ac-checker(
class='w162 cell border'
no-permission="acl:Delete"
data-src="${value['@id']}"
)
solid-link(class="backlink right", bind-resources, next='circle-profile') Retour
solid-ac-checker(permission='acl:Write', bind-resources)
@ -70,7 +43,7 @@ div.content-box__info
class-description='form-label is-light is-full-width input-text-like'
class-status='form-label is-light is-full-width member-select color'
widget-owner='solid-form-auto-completion'
widget-owner='solid-form-dropdown-autocompletion-label'
partial=''
@ -89,7 +62,7 @@ div.content-box__info
class-user='team form-label is-light'
label-user=''
widget-user='solid-form-auto-completion'
widget-user='solid-form-dropdown-autocompletion-label'
submit-button='Ajouter un membre'
)
@ -100,14 +73,28 @@ div.content-box__info
div.w280 Nom
div.w162 Accès
//-class='table-body'
solid-display(
class='table-body'
bind-resources
fields='members'
nested-field='members'
fields='classGroup(user.account.picture, sup(user.name, user.groups), sub(user.profile.city)), self'
loader-id='loader-circle-edit'
multiple-members=''
widget-members='hubl-team-template-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'
class-user.account.picture='user-thumb__picture avatar'
class-user.name='user-thumb__name'
class-user.groups='user-thumb__groups'
class-user.profile.city='user-thumb__city'
widget-user.account.picture='hubl-user-avatar'
multiple-user.groups=''
widget-user.groups='hubl-user-groups'
action-self='self'
widget-self='circle-edit-members-delete'
)
//- Only to show the table grid
div.w162.cell.border

View File

@ -3,7 +3,6 @@ solid-router(default-route='circle-profile', hidden)
solid-route(name='circle-edit')
#circle-profile(hidden)
include ../../templates/hubl-circle-team.pug
.content-box__info.flex
@ -23,7 +22,7 @@ solid-router(default-route='circle-profile', hidden)
value-title='Date de création : '
widget-creationDate='solid-display-date'
widget-creationDate='solid-display-value-date'
)
solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
solid-ac-checker(permission='acl:Delete', bind-resources)
@ -38,6 +37,7 @@ solid-router(default-route='circle-profile', hidden)
class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash'
bind-resources
data-label='Supprimer le cercle'
next='admin-circles'
)
solid-widget(name='hubl-circle-leave-button')
@ -80,14 +80,26 @@ solid-router(default-route='circle-profile', hidden)
h2 Membres :
solid-widget(name='hubl-circle-user-admin')
template ${value ? "Administrateur" : ""}
solid-display.block(
bind-resources
fields='members'
nested-field='members'
loader-id='loader-circle-profile'
fields='classGroup(user.account.picture, sup(user.name, is_admin), sub(user.profile.city))'
multiple-members=''
widget-members='hubl-circle-team-template'
class-classGroup='user-thumb is-spaced'
class-user.account.picture='avatar user-thumb__picture'
class-user.name='user-thumb__name'
class-is_admin='user-thumb__admin'
class-user.profile.city='user-thumb__city'
widget-classGroup='solid-set-div'
widget-user.account.picture='hubl-user-avatar'
widget-is_admin='hubl-circle-user-admin'
)
#circle-edit.content-box__height(hidden)
include page-circle-edit.pug

View File

@ -12,12 +12,11 @@
class-description='field form-label is-light is-expanded'
label-description='Description*'
widget-description='solid-form-textarea'
widget-description='solid-form-textarea-label'
class-skills='form-label is-dark select-skills'
label-skills='The required skills for this mission:*'
multiple-skills='solid-multiple-select'
widget-skills='solid-form-auto-completion'
multiple-skills='solid-form-dropdown-autocompletion-label'
class-closingDate='form-label is-dark'
label-closingDate='Publication end date:*'

View File

@ -12,12 +12,11 @@
class-description='field form-label is-light is-expanded'
label-description='Description*'
widget-description='solid-form-textarea'
widget-description='solid-form-textarea-label'
class-skills='form-label is-dark select-skills'
label-skills='The required skills for this mission:*'
multiple-skills='solid-multiple-select'
widget-skills='solid-form-auto-completion'
multiple-skills='solid-form-dropdown-autocompletion-label'
class-closingDate='form-label is-dark'
label-closingDate='Publication end date:*'

View File

@ -1,6 +1,15 @@
div.content-box__info
include ../../templates/hubl-user-avatar.pug
solid-widget(name="project-edit-members-delete")
template
solid-ac-checker(permission="acl:Delete" data-src="${src}")
solid-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${src}"
data-label='Retirer'
)
solid-link(class='backlink right', bind-resources, next='project-profile') Retour
@ -42,7 +51,7 @@ div.content-box__info
class-user='team form-label is-light'
label-user=''
widget-user='solid-form-auto-completion'
widget-user='solid-form-dropdown-autocompletion-label'
submit-button='Ajouter un membre'
)
@ -57,9 +66,21 @@ div.content-box__info
solid-display(
class='table-body'
bind-resources
fields='members'
nested-field='members'
fields='classGroup(user.account.picture, sup(user.name, user.groups), sub(user.profile.city)), self'
loader-id='loader-project-edit'
multiple-members=''
widget-members='hubl-team-template-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'
class-user.account.picture='user-thumb__picture avatar'
class-user.name='user-thumb__name'
class-user.groups='user-thumb__groups'
class-user.profile.city='user-thumb__city'
widget-user.account.picture='hubl-user-avatar'
multiple-user.groups=''
widget-user.groups='hubl-user-groups'
action-self='self'
widget-self='project-edit-members-delete'
)

View File

@ -4,7 +4,6 @@ solid-router(default-route='project-profile', hidden)
#project-profile(hidden)
include ../../templates/hubl-captain.pug
include ../../templates/hubl-project-team.pug
.content-box__info.flex
@ -24,7 +23,7 @@ solid-router(default-route='project-profile', hidden)
value-title='Date de création : '
widget-creationDate='solid-display-date'
widget-creationDate='solid-display-value-date'
)
solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
solid-ac-checker(permission='acl:Delete', bind-resources)
@ -38,6 +37,7 @@ solid-router(default-route='project-profile', hidden)
class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash'
bind-resources
data-label='Supprimer le projet'
next='admin-projects'
)
solid-widget(name='hubl-project-leave-button')
@ -79,12 +79,24 @@ solid-router(default-route='project-profile', hidden)
h2 Equipe :
solid-widget(name='hubl-project-user-admin')
template ${value ? "Administrateur" : ""}
solid-display.block(
bind-resources
fields='members'
nested-field='members'
fields='classGroup(user.account.picture, sup(user.name, is_admin), sub(user.profile.city, name))'
multiple-members
widget-members='hubl-project-team'
class-classGroup='user-thumb is-spaced'
class-user.account.picture='avatar user-thumb__picture'
class-user.name='user-thumb__name'
class-is_admin='user-thumb__admin'
class-user.profile.city='user-thumb__city'
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)