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

Fixes & Hubl branding

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier
2020-05-08 13:27:44 +00:00
committed by Rachel
parent 35a0a20119
commit 40792273fe
51 changed files with 722 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,15 +7,12 @@
div.content-box__header
h1.without-margin Administration
#circle-left(hidden)
include ../circle/page-circle-left.pug
include ../circle/page-circle-left.pug
#admin-circle-list(hidden)
include ../../templates/hd-user-avatar.pug
include ../../templates/hubl-user-avatar.pug
sib-widget(name='circle-owner')
sib-widget(name='hubl-circle-owner')
template
sib-display.user-thumb(
data-src='${await value}'
@ -25,7 +22,7 @@
class-name='user-thumb__name'
class-username='user-thumb__username'
widget-account.picture='hd-user-avatar'
widget-account.picture='hubl-user-avatar'
)
@ -43,11 +40,11 @@
.table
div.table-header.grey-color
div Nom
div Administrateurs
div Rejoindre
div.w33 Nom
div.w33 Administrateurs
div.w33 Rejoindre
sib-widget(name='admin-circle-leave-button')
sib-widget(name='hubl-admin-circle-leave-button')
template
sib-delete(
class='button text-bold text-uppercase reversed button-dark bordered with-icon icon-close'
@ -67,21 +64,18 @@
class-leaveButton='w33 cell border cell-with-buttons'
action-leaveButton="joinButton"
widget-leaveButton="admin-circle-leave-button"
widget-circle.owner='circle-owner'
widget-leaveButton="hubl-admin-circle-leave-button"
widget-circle.owner='hubl-circle-owner'
)
sib-widget(name='admin-circle-join-button')
sib-widget(name='hubl-admin-circle-join-button')
template
sib-form.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.flex(
data-src='${value}'
fields='user.@id'
label-user.@id=''
value-user.@id='self'
widget-user.@id='sib-form-hidden'
hd-inherit-bind-user2input="input[name='user.@id']"
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='sib-form-hidden'
submit-button='Rejoindre'
)
@ -94,10 +88,10 @@
class-name='w33 cell border cell-with-name'
class-owner='w33 cell border cell-with-id-card'
widget-owner='circle-owner'
widget-owner='hubl-circle-owner'
class-members='w33 cell border cell-with-buttons'
widget-members="admin-circle-join-button"
widget-members="hubl-admin-circle-join-button"
)

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

@ -1,11 +1,11 @@
sib-widget(name='hd-template-project-title')
sib-widget(name='hubl-template-project-title')
template
p ${value}
div.content-box__info
sib-link(class="backlink right" next='admin-project-list') Retour
sib-widget(name="admin-project-add-user")
sib-widget(name="hubl-admin-project-add-user")
template
sib-form(
data-holder
@ -25,11 +25,11 @@ div.content-box__info
class-fieldset-fee='fieldset'
value-fieldset-fee='Contributions'
widget-fieldset-fee='hd-template-project-title'
widget-fieldset-fee='hubl-template-project-title'
class-fieldset-captain='fieldset'
value-fieldset-captain='Capitaine'
widget-fieldset-captain='hd-template-project-title'
widget-fieldset-captain='hubl-template-project-title'
label-customer='Nom du client*'
class-customer='member-select form-label is-light is-half-width'

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

@ -11,7 +11,7 @@
include ../project/page-project-left.pug
#admin-project-list(hidden)
include ../../templates/hd-user-avatar.pug
include ../../templates/hubl-user-avatar.pug
div.content-box__info
div.admin-header
@ -28,7 +28,7 @@
div Capitaines
div Accès
sib-widget(name="admin-project-leave-button")
sib-widget(name="hubl-admin-project-leave-button")
template
sib-delete(
class='button text-bold text-uppercase reversed button-dark bordered with-icon icon-close'
@ -36,7 +36,7 @@
data-label='Quitter'
)
sib-widget(name='project-captain')
sib-widget(name='hubl-project-captain')
template
sib-display.user-thumb(
data-src='${await value}'
@ -46,10 +46,10 @@
class-name='user-thumb__name'
class-username='user-thumb__username'
widget-account.picture='hd-user-avatar'
widget-account.picture='hubl-user-avatar'
)
sib-widget(name='project-admins')
sib-widget(name='hubl-project-admins')
template
sib-display(
data-src='${value}'
@ -57,21 +57,21 @@
search-fields='is_admin'
search-value-is_admin='true'
search-widget-is_admin='sib-form-hidden'
widget-user='project-captain'
widget-user='hubl-project-captain'
)
sib-widget(name="admin-project-buttons")
sib-widget(name="hubl-admin-project-buttons")
template
sib-display(
data-src='${src}'
nested-field='members'
fields='relation'
action-relation='relation'
widget-relation='admin-project-leave-button'
widget-relation='hubl-admin-project-leave-button'
search-fields='user'
search-widget-user='sib-form-hidden'
search-value-user="-"
hd-inherit-user-id="search-value-user"
hubl-inherit-user-id="search-value-user"
)
sib-display(
@ -88,8 +88,8 @@
widget-buttons="admin-project-buttons"
action-buttons="buttons"
widget-captain='project-captain'
widget-members='project-admins'
widget-captain='hubl-project-captain'
widget-members='hubl-project-admins'
)
#admin-project-create(hidden)

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

@ -7,22 +7,17 @@ div.content-box__info
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), line-4-border-top(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-groups='form-label is-light is-half-width select-groups'
label-first_name='Prénom *'
label-last_name='Nom *'
label-username='Nom d\'utilisateur *'
label-email='E-mail *'
label-groups='Groupes'
multiple-groups='sib-multiple-select'
widget-groups='sib-form-auto-completion'
value-password=''
widget-password='sib-form-hidden'
@ -31,5 +26,3 @@ div.content-box__info
submit-button='Enregistrer'
)
p Seuls les administrateurs de ta plateforme peuvent créer de nouveaux Groupes dans l'Administration Django.

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

@ -12,22 +12,17 @@ div.content-box__info
bind-resources=''
range-groups=`${endpoints.groups || endpoints.get.groups}`
fields='line-1(first_name, last_name), line-2(username, email), line-4-border-top(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-groups='form-label is-light is-half-width select-groups'
label-first_name='Prénom *'
label-last_name='Nom *'
label-username='Nom d\'utilisateur *'
label-email='E-mail *'
label-groups='Groupes'
multiple-groups='sib-multiple-select'
widget-groups='sib-form-auto-completion'
next='admin-user-list'

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

@ -7,7 +7,7 @@
div.content-box__header
h1.without-margin Administration
sib-widget(name='sib-action-hd-custom')
sib-widget(name='hubl-sib-action-custom')
template
sib-ac-checker(data-src="${src}", permission='acl:Write')
sib-link(
@ -16,7 +16,7 @@
next="${value}"
)
sib-widget(name='hd-user-admin-groups-display')
sib-widget(name='hubl-user-admin-groups-display')
template
sib-display(
data-src="${value}"
@ -36,29 +36,24 @@
.table
div.table-header.grey-color
div Nom
div Groupes
div
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))), groups, actions'
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='hd-user-avatar'
class-groups='w33 cell border cell-with-groups'
multiple-groups=''
widget-groups='hd-user-admin-groups-display'
widget-account.picture='hubl-user-avatar'
label-actions='Edit'
action-actions='admin-users-edit'
class-actions='w33 cell border cell-with-buttons'
widget-actions='sib-action-hd-custom'
class-actions='w25 cell border cell-with-buttons'
widget-actions='hubl-sib-action-custom'
order-by='username'
)