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

fix: merge conflicts

Browse Source
This commit is contained in:
Jure Ursic
2020-06-15 13:58:51 +02:00
parent 34ec5d9d38 de2e61fdf1
commit 628fec9a94
56 changed files with 1667 additions and 1604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/admin/page-admin-circles-create.pug
View File

@ -1,23 +1,23 @@
div.content-box__info
div.content-box__info.flex
sib-link(class="backlink right", next='admin-circle-list') Retour
h1.centered Créer un canal
sib-form(
sib-form.form.button-register(
data-src=`${endpoints.circles || endpoints.post.circles}`
fields='status, name, description'
class-status='form-label is-light is-full-width color'
class-name='form-label is-light is-full-width input-text-like'
class-description='form-label is-light is-full-width input-text-like'
label-status='Statut du canal'
widget-status='hubl-status'
class-name='form-label is-light is-full-width'
class-description='form-label is-light is-full-width'
class-status='form-label is-light is-full-width member-select color'
label-name='Nom du canal *'
label-description='Sous-titre du canal *'
widget-status='hubl-status'
next='admin-circle-list'
submit-button='Enregistrer'

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

@ -1,24 +1,25 @@
.content-box.full-width.with-form
.content-box.flex.full-width.with-form
sib-router(default-route='admin-circle-list', hidden)
sib-route(name='admin-circle-list')
sib-route(name='admin-circle-create')
sib-route(name='circle-left')
div.content-box__header
div.content-box__header.flex.space-between
h1.without-margin Administration
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
include ../circle/page-circle-left.pug
#admin-circle-list(hidden)
#admin-circle-list.content-box__height(hidden)
include ../../templates/hubl-user-avatar.pug
sib-widget(name='hubl-circle-owner')
template
sib-display.user-thumb(
sib-display.user-thumb.is-spaced(
data-src='${await value}'
fields='account.picture, sup(name), sub(username)'
class-account.picture='user-thumb__picture'
class-account.picture='avatar user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
@ -26,78 +27,79 @@
)
div.content-box__info
div.content-box__info.flex
div.admin-header
div.admin-header.flex
div.admin-header__title Canaux
h3 Canaux
sib-link(
class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
next='admin-circle-create'
) Créer un canal
.table
.table-wrapper
.table
div.table-header.grey-color
div.w33 Nom
div.w33 Administrateurs
div.w33 Rejoindre
div.table-header.grey-color
div.w280 Nom
div.w280 Administrateurs
div.w280 Rejoindre
sib-widget(name='hubl-admin-circle-leave-button')
template
sib-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${src}"
data-label='Quitter'
)
sib-widget(name='hubl-admin-circle-leave-button')
template
sib-delete(
class='circle-leave button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${src}"
data-label='Quitter'
)
sib-display(
class='table-body'
sib-display(
class='table-body'
bind-user
nested-field='circles'
fields='circle.name, circle.owner, leaveButton'
bind-user
nested-field='circles'
fields='circle.name, circle.owner, leaveButton'
class-circle.name='w33 cell border cell-with-name'
class-circle.owner='w33 cell border cell-with-id-card'
class-leaveButton='w33 cell border cell-with-buttons'
class-circle.name='w280 border cell-with-name'
class-circle.owner='w280 border cell-with-id-card'
class-leaveButton='w280 border cell-with-buttons'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
widget-circle.owner='hubl-circle-owner'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
widget-circle.owner='hubl-circle-owner'
order-by="circle.name"
)
order-by="circle.name"
)
sib-widget(name='hubl-admin-circle-join-button')
template
sib-form.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex(
data-src='${value}'
sib-widget(name='hubl-admin-circle-join-button')
template
sib-form.circle-join.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex(
data-src='${value}'
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='sib-form-hidden'
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='sib-form-hidden'
submit-button='Rejoindre'
)
submit-button='Rejoindre'
)
sib-display(
class='table-body'
sib-display(
class='table-body'
data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
fields='name, owner, members'
data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
fields='name, owner, members'
class-name='w33 cell border cell-with-name'
class-owner='w33 cell border cell-with-id-card'
widget-owner='hubl-circle-owner'
class-name='w280 border cell-with-name'
class-owner='w280 border cell-with-id-card'
widget-owner='hubl-circle-owner'
class-members='w33 cell border cell-with-buttons'
widget-members="hubl-admin-circle-join-button"
class-members='w280 border cell-with-buttons'
widget-members="hubl-admin-circle-join-button"
order-by="name"
)
order-by="name"
)
#admin-circle-create(hidden)
#admin-circle-create.content-box__height(hidden)
include page-admin-circles-create.pug

14
src/views/admin/page-admin-projects-create.pug
View File

@ -1,8 +1,4 @@
sib-widget(name='hubl-template-project-title')
template
p ${value}
div.content-box__info
div.content-box__info.flex
sib-link(class="backlink right" next='admin-project-list') Retour
sib-widget(name="hubl-admin-project-add-user")
@ -18,10 +14,10 @@ div.content-box__info
h1 Créer un nouveau projet
sib-form(
sib-form.form.button-register(
data-src=`${endpoints.projects || endpoints.post.projects}`
fields='status,line-1(customer.name, name), description, line-10(captain)'
fields='status, line-1(customer.name, name), description, line-10(captain)'
label-status='Statut du canal*'
widget-status='hubl-status'
@ -38,11 +34,11 @@ div.content-box__info
class-customer.name='form-label is-light is-half-width'
label-name='Nom du projet*'
class-name='form-label is-light is-half-width'
class-name='form-label is-light is-half-width input-text-like'
label-captain='Capitaine du projet*'
range-captain=`${endpoints.users || endpoints.get.users}`
class-captain='member-select form-label is-light is-half-width'
class-captain='form-label is-light is-half-width'
widget-captain='sib-form-auto-completion'
next='project-picture'

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

@ -1,21 +1,22 @@
.content-box.full-width.with-form
.content-box.flex.full-width.with-form
sib-router(default-route='admin-project-list', hidden)
sib-route(name='admin-project-list')
sib-route(name='admin-project-create')
sib-route(name='project-left')
div.content-box__header
div.content-box__header.flex.space-between
h1.without-margin Administration
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
#project-left(hidden)
include ../project/page-project-left.pug
#admin-project-list(hidden)
#admin-project-list.content-box__height(hidden)
include ../../templates/hubl-user-avatar.pug
div.content-box__info
div.admin-header
div.admin-header__title Projets
div.content-box__info.flex
div.admin-header.flex
h3 Projets
sib-link(
class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
next='admin-project-create'

13
src/views/admin/page-admin-users-create.pug
View File

@ -1,18 +1,17 @@
div.content-box__info
div.content-box__info.flex
sib-link(class='backlink right', next='admin-users-list') Retour
h1.centered Ajouter un utilisateur à la plateforme
sib-form(
sib-form.form.button-register(
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)'
class-first_name='form-label is-light is-half-width'
class-last_name='form-label is-light is-half-width'
class-username='form-label is-light is-half-width'
class-email='form-label is-light is-half-width'
class-first_name='form-label is-light is-half-width input-text-like'
class-last_name='form-label is-light is-half-width input-text-like'
class-username='form-label is-light is-half-width input-text-like'
class-email='form-label is-light is-half-width input-text-like'
label-first_name='Prénom *'
label-last_name='Nom *'

13
src/views/admin/page-admin-users-edit.pug
View File

@ -1,4 +1,4 @@
div.content-box__info
div.content-box__info.flex
sib-link(class='backlink right', next='admin-users-list') Retour
h1.centered
@ -8,16 +8,15 @@ div.content-box__info
fields='name'
)
sib-form(
sib-form.form.button-register(
bind-resources=''
range-groups=`${endpoints.groups || endpoints.get.groups}`
fields='line-1(first_name, last_name), line-2(username, email)'
class-first_name='form-label is-light is-half-width'
class-last_name='form-label is-light is-half-width'
class-username='form-label is-light is-half-width'
class-email='form-label is-light is-half-width'
class-first_name='form-label is-light is-half-width input-text-like'
class-last_name='form-label is-light is-half-width input-text-like'
class-username='form-label is-light is-half-width input-text-like'
class-email='form-label is-light is-half-width input-text-like'
label-first_name='Prénom *'
label-last_name='Nom *'

65
src/views/admin/page-admin-users.pug
View File

@ -1,11 +1,12 @@
.content-box.full-width.with-form
.content-box.flex.full-width.with-form
sib-router(default-route='admin-users-list', hidden)
sib-route(name='admin-users-list')
sib-route(name='admin-users-create')
sib-route(name='admin-users-edit')
div.content-box__header
div.content-box__header.flex.space-between
h1.without-margin Administration
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
sib-widget(name='hubl-sib-action-custom')
template
@ -16,51 +17,45 @@
next="${value}"
)
sib-widget(name='hubl-user-admin-groups-display')
template
sib-display(
data-src="${value}"
fields="name"
)
#admin-users-list(hidden)
div.content-box__info
div.admin-header
div.admin-header__title Utilisateurs
#admin-users-list.content-box__height(hidden)
div.content-box__info.flex
div.admin-header.flex
h3 Utilisateurs
sib-ac-checker(data-src=`${endpoints.users || endpoints.post.users}`, permission='acl:Append')
sib-link(
class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
next='admin-users-create'
) Ajouter un utilisateur
.table
div.table-header.grey-color
div.w75 Nom
div.w25
sib-display(
class='table-body'
data-src=`${endpoints.users || endpoints.get.users}`
fields='cell-1(user-thumb(account.picture, sup(name), sub(username))), actions'
.table-wrapper
.table
div.table-header.grey-color
div.w280 Nom
div.w70
sib-display(
class='table-body'
data-src=`${endpoints.users || endpoints.get.users}`
fields='cell-1(user-thumb(account.picture, sup(name), sub(username))), actions'
class-account.picture='user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
class-profile.city='user-thumb__city'
widget-account.picture='hubl-user-avatar'
class-account.picture='avatar user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
class-profile.city='user-thumb__city'
widget-account.picture='hubl-user-avatar'
label-actions='Edit'
action-actions='admin-users-edit'
class-actions='w25 cell border cell-with-buttons'
widget-actions='hubl-sib-action-custom'
label-actions='Edit'
action-actions='admin-users-edit'
class-actions='w70 border cell-with-buttons'
widget-actions='hubl-sib-action-custom'
order-by='username'
)
order-by='username'
)
#admin-users-create(hidden)
#admin-users-create.content-box__height(hidden)
include page-admin-users-create.pug
#admin-users-edit(hidden)
#admin-users-edit.content-box__height(hidden)
include page-admin-users-edit.pug