Fixes & Hubl branding
This commit is contained in:
Jean-Baptiste Pasquier
committed by
Rachel
Rachel
parent
35a0a20119
commit
40792273fe
@ -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"
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -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'
|
||||
)
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
data-authentication='login',
|
||||
data-auto-login='true',
|
||||
data-bosh-service-url=`${xmpp}`,
|
||||
data-debug='false',
|
||||
data-locales-url='en',
|
||||
data-i18n='en',
|
||||
bind-resources
|
||||
)
|
||||
@ -1,14 +1,14 @@
|
||||
div.content-box__info
|
||||
|
||||
include ../../templates/hd-user-avatar.pug
|
||||
include ../../templates/hubl-user-avatar.pug
|
||||
|
||||
sib-widget(name='hd-user-groups')
|
||||
sib-widget(name='hubl-user-groups')
|
||||
template ${await value.name}
|
||||
|
||||
sib-widget(name='team-template-edit')
|
||||
sib-widget(name='hubl-team-template-edit')
|
||||
template
|
||||
sib-display.user-thumb(
|
||||
class='w50 cell border cell-with-id-card user-thumb'
|
||||
class='w66 cell border cell-with-id-card user-thumb'
|
||||
data-src='${await value.user}'
|
||||
fields='account.picture, sup(name, groups), sub(profile.city)'
|
||||
|
||||
@ -17,14 +17,14 @@ div.content-box__info
|
||||
class-groups='user-thumb__groups'
|
||||
class-profile.city='user-thumb__city'
|
||||
|
||||
widget-account.picture='hd-user-avatar'
|
||||
widget-account.picture='hubl-user-avatar'
|
||||
|
||||
multiple-groups=''
|
||||
widget-groups='hd-user-groups'
|
||||
widget-groups='hubl-user-groups'
|
||||
)
|
||||
|
||||
sib-ac-checker(
|
||||
class='w50 cell border'
|
||||
class='w33 cell border'
|
||||
permission="acl:Delete"
|
||||
data-src="${value['@id']}"
|
||||
)
|
||||
@ -36,7 +36,7 @@ div.content-box__info
|
||||
|
||||
//- Only to show the table grid
|
||||
sib-ac-checker(
|
||||
class='w50 cell border'
|
||||
class='w33 cell border'
|
||||
no-permission="acl:Delete"
|
||||
data-src="${value['@id']}"
|
||||
)
|
||||
@ -87,8 +87,8 @@ div.content-box__info
|
||||
.table
|
||||
|
||||
div.table-header.grey-color
|
||||
div Nom
|
||||
div Accès
|
||||
div.w66 Nom
|
||||
div.w33 Accès
|
||||
|
||||
//-class='table-body'
|
||||
sib-display(
|
||||
@ -97,6 +97,6 @@ div.content-box__info
|
||||
fields='members'
|
||||
|
||||
multiple-members=''
|
||||
widget-members='team-template-edit'
|
||||
widget-members='hubl-team-template-edit'
|
||||
)
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#circle-left
|
||||
#circle-left(hidden)
|
||||
div.content-box__info(style="padding: 15px")
|
||||
|
||||
p Tu as quitté ce canal.
|
||||
p Ceci est un groupe privé. Pour le rejoindre, rends-toi dans le panneau <sib-link next="admin-circle-list">administration</sib-link> et demande une invitation.
|
||||
p Pour le rejoindre à nouveau, rends-toi dans le panneau <sib-link next="admin-circle-list">administration</sib-link> ou contacte un administrateur.
|
||||
|
||||
@ -3,7 +3,7 @@ sib-router(default-route='circle-profile', hidden)
|
||||
sib-route(name='circle-edit')
|
||||
|
||||
#circle-profile(hidden)
|
||||
include ../../templates/hd-circle-team.pug
|
||||
include ../../templates/hubl-circle-team.pug
|
||||
.content-box__info
|
||||
|
||||
.space-between
|
||||
@ -28,7 +28,7 @@ sib-router(default-route='circle-profile', hidden)
|
||||
fields='members'
|
||||
|
||||
multiple-members=''
|
||||
widget-members='circle-team-template'
|
||||
widget-members='hubl-circle-team-template'
|
||||
)
|
||||
|
||||
div.box-button
|
||||
@ -39,7 +39,7 @@ sib-router(default-route='circle-profile', hidden)
|
||||
data-label='Supprimer le canal'
|
||||
)
|
||||
|
||||
sib-widget(name='circle-leave-button')
|
||||
sib-widget(name='hubl-circle-leave-button')
|
||||
template
|
||||
sib-delete(
|
||||
class='button btn-margin-left text-bold text-uppercase reversed button-dark bordered with-icon icon-close'
|
||||
@ -47,7 +47,7 @@ sib-router(default-route='circle-profile', hidden)
|
||||
data-label='Quitter le canal'
|
||||
)
|
||||
|
||||
sib-widget(name='circle-join-button')
|
||||
sib-widget(name='hubl-circle-join-button')
|
||||
template
|
||||
button.button.btn-margin-left.text-bold.text-uppercase.reversed.button-dark.bordered.with-icon.icon-arrow-right-circle.flex
|
||||
sib-form(
|
||||
@ -59,7 +59,7 @@ sib-router(default-route='circle-profile', hidden)
|
||||
value-user.@id=''
|
||||
widget-user.@id='sib-form-hidden'
|
||||
|
||||
hd-inherit-bind-user2input="input[name='user.@id']"
|
||||
hubl-inherit-bind-user2input="input[name='user.@id']"
|
||||
|
||||
submit-button='Rejoindre le canal'
|
||||
)
|
||||
@ -69,13 +69,13 @@ sib-router(default-route='circle-profile', hidden)
|
||||
nested-field='members'
|
||||
fields='relation'
|
||||
action-relation='relation'
|
||||
widget-relation='circle-leave-button'
|
||||
widget-relation='hubl-circle-leave-button'
|
||||
search-fields='user'
|
||||
search-widget-user='sib-form-hidden'
|
||||
search-value-user=""
|
||||
empty-widget='circle-join-button'
|
||||
hd-inherit-bind-resources='circle-join-button'
|
||||
hd-inherit-user-id="search-value-user"
|
||||
empty-widget='hubl-circle-join-button'
|
||||
hubl-inherit-bind-resources='hubl-circle-join-button'
|
||||
hubl-inherit-user-id="search-value-user"
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
data-authentication='login',
|
||||
data-auto-login='true',
|
||||
data-bosh-service-url=`${xmpp}`,
|
||||
data-debug='false',
|
||||
data-locales-url='en',
|
||||
data-i18n='en',
|
||||
bind-resources
|
||||
)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
div.content-box__info
|
||||
|
||||
include ../../templates/hd-user-avatar.pug
|
||||
include ../../templates/hubl-user-avatar.pug
|
||||
|
||||
sib-widget(name='hd-fieldset-title')
|
||||
sib-widget(name='hubl-fieldset-title')
|
||||
template
|
||||
label ${label}
|
||||
|
||||
@ -24,7 +24,7 @@ div.content-box__info
|
||||
range-customer=`${endpoints.customers || endpoints.get.customers}`
|
||||
label-name='Nom du projet*'
|
||||
label-description='Description du projet'
|
||||
widget-fieldset-info='hd-fieldset-title'
|
||||
widget-fieldset-info='hubl-fieldset-title'
|
||||
widget-description='sib-form-textarea'
|
||||
|
||||
class-fieldset-fee='fieldset'
|
||||
@ -33,7 +33,7 @@ div.content-box__info
|
||||
label-fieldset-fee='Contributions'
|
||||
label-businessprovider='Apporteur d\'affaire'
|
||||
label-businessproviderfee='Montant de la contribution'
|
||||
widget-fieldset-fee='hd-fieldset-title'
|
||||
widget-fieldset-fee='hubl-fieldset-title'
|
||||
|
||||
submit-button='Enregistrer'
|
||||
)
|
||||
@ -66,5 +66,5 @@ div.content-box__info
|
||||
fields='members'
|
||||
|
||||
multiple-members=''
|
||||
widget-members='team-template-edit'
|
||||
widget-members='hubl-team-template-edit'
|
||||
)
|
||||
|
||||
@ -3,11 +3,10 @@ sib-router(default-route='project-profile', hidden)
|
||||
sib-route(name='project-edit')
|
||||
|
||||
#project-profile(hidden)
|
||||
include ../../templates/hd-business-provider.pug
|
||||
include ../../templates/hd-captain.pug
|
||||
include ../../templates/hd-circle-team.pug
|
||||
include ../../templates/hd-customer.pug
|
||||
include ../../templates/hd-project-team.pug
|
||||
include ../../templates/hubl-captain.pug
|
||||
include ../../templates/hubl-circle-team.pug
|
||||
include ../../templates/hubl-customer.pug
|
||||
include ../../templates/hubl-project-team.pug
|
||||
|
||||
.content-box__info
|
||||
|
||||
@ -33,7 +32,7 @@ sib-router(default-route='project-profile', hidden)
|
||||
|
||||
value-label-captain='Capitaine :'
|
||||
class-label-captain='h2-like'
|
||||
widget-captain='hd-captain'
|
||||
widget-captain='hubl-captain'
|
||||
)
|
||||
sib-display(
|
||||
class='customer-logo'
|
||||
@ -47,19 +46,13 @@ sib-router(default-route='project-profile', hidden)
|
||||
sib-link(next='project-contributions-help').button-question__position
|
||||
button(aria-label='modal activator').icon-question.button-question__color
|
||||
|
||||
sib-display(
|
||||
bind-resources
|
||||
fields='businessProvider',
|
||||
widget-businessProvider='hd-business-provider'
|
||||
)
|
||||
|
||||
h2 Informations sur le client :
|
||||
|
||||
sib-display(
|
||||
bind-resources
|
||||
fields='customer'
|
||||
|
||||
widget-customer='hd-customer'
|
||||
widget-customer='hubl-customer'
|
||||
)
|
||||
|
||||
h2 Equipe :
|
||||
@ -68,11 +61,11 @@ sib-router(default-route='project-profile', hidden)
|
||||
bind-resources
|
||||
fields='members'
|
||||
|
||||
widget-members='hd-project-team'
|
||||
widget-members='hubl-project-team'
|
||||
multiple-members
|
||||
)
|
||||
|
||||
sib-widget(name='project-leave-button')
|
||||
sib-widget(name='hubl-project-leave-button')
|
||||
template
|
||||
sib-delete(
|
||||
class='button btn-margin-left text-bold text-uppercase reversed button-dark bordered with-icon icon-close'
|
||||
@ -87,13 +80,13 @@ sib-router(default-route='project-profile', hidden)
|
||||
fields='relation'
|
||||
|
||||
action-relation='relation'
|
||||
widget-relation='project-leave-button'
|
||||
widget-relation='hubl-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"
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user