Merge branch 'feature/fix-from-rework-css' of git.startinblox.com:applications/hubl into release/0.10
This commit is contained in:
Jean-Baptiste Pasquier
@ -12,26 +12,23 @@ div.content-box__info.flex
|
||||
naked
|
||||
)
|
||||
|
||||
h1 Créer un nouveau projet
|
||||
h1.centered Créer un nouveau projet
|
||||
|
||||
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), logo'
|
||||
|
||||
label-status='Statut du canal*'
|
||||
widget-status='hubl-status'
|
||||
class-status='form-label is-light is-full-width member-select color'
|
||||
class-status='form-label is-light is-full-width'
|
||||
|
||||
label-description='Description du projet'
|
||||
class-description='form-label is-light is-full-width'
|
||||
class-description='form-label is-light is-full-width input-text-like'
|
||||
widget-description='sib-form-textarea'
|
||||
|
||||
class-fieldset-captain='fieldset'
|
||||
widget-fieldset-captain='hubl-template-project-title'
|
||||
|
||||
label-customer.name='Nom du client*'
|
||||
class-customer.name='form-label is-light is-half-width'
|
||||
class-customer.name='form-label is-light is-half-width input-text-like'
|
||||
|
||||
label-name='Nom du projet*'
|
||||
class-name='form-label is-light is-half-width input-text-like'
|
||||
@ -41,6 +38,12 @@ div.content-box__info.flex
|
||||
class-captain='form-label is-light is-half-width'
|
||||
widget-captain='sib-form-auto-completion'
|
||||
|
||||
class='input-text-like'
|
||||
widget-logo="sib-form-file"
|
||||
label-logo="Télécharger un logo"
|
||||
class-logo='select-add'
|
||||
upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}`
|
||||
|
||||
next='project-picture'
|
||||
|
||||
submit-button='Enregistrer et ajouter des membres'
|
||||
|
||||
@ -22,106 +22,107 @@
|
||||
next='admin-project-create'
|
||||
) Créer un nouveau projet
|
||||
|
||||
.table
|
||||
div.table-header.grey-color
|
||||
div.w25 Nom
|
||||
div.w25 Administrateurs
|
||||
div.w25 Capitaines
|
||||
div.w25 Rejoindre
|
||||
.table-wrapper
|
||||
.table
|
||||
div.table-header.grey-color
|
||||
div.w280 Nom
|
||||
div.w280 Administrateurs
|
||||
div.w280 Capitaines
|
||||
div.w230 Rejoindre
|
||||
|
||||
sib-widget(name="hubl-admin-project-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-project-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-project-captain')
|
||||
template
|
||||
sib-display.user-thumb(
|
||||
data-src='${await value}'
|
||||
fields='account.picture, sup(name), sub(username)'
|
||||
sib-widget(name='hubl-project-captain')
|
||||
template
|
||||
sib-display.user-thumb.is-spaced(
|
||||
data-src='${await value}'
|
||||
fields='account.picture, sup(name), sub(username)'
|
||||
|
||||
class-account.picture='user-thumb__picture'
|
||||
class-name='user-thumb__name'
|
||||
class-username='user-thumb__username'
|
||||
class-account.picture='user-thumb__picture'
|
||||
class-name='user-thumb__name'
|
||||
class-username='user-thumb__username'
|
||||
|
||||
widget-account.picture='hubl-user-avatar'
|
||||
)
|
||||
widget-account.picture='hubl-user-avatar'
|
||||
)
|
||||
|
||||
sib-widget(name='hubl-project-admins')
|
||||
template
|
||||
sib-display(
|
||||
data-src='${value}'
|
||||
fields='user'
|
||||
search-fields='is_admin'
|
||||
search-value-is_admin='true'
|
||||
search-widget-is_admin='sib-form-hidden'
|
||||
widget-user='hubl-project-captain'
|
||||
)
|
||||
sib-widget(name='hubl-project-admins')
|
||||
template
|
||||
sib-display.user-thumb.is-spaced(
|
||||
data-src='${value}'
|
||||
fields='user'
|
||||
search-fields='is_admin'
|
||||
search-value-is_admin='true'
|
||||
search-widget-is_admin='sib-form-hidden'
|
||||
widget-user='hubl-project-captain'
|
||||
)
|
||||
|
||||
sib-widget(name='hubl-admin-project-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-project-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-display(
|
||||
class='table-body'
|
||||
sib-display(
|
||||
class='table-body'
|
||||
|
||||
bind-user
|
||||
nested-field="projects"
|
||||
fields='project.name, project.members, project.captain, leaveButton'
|
||||
bind-user
|
||||
nested-field="projects"
|
||||
fields='project.name, project.members, project.captain, leaveButton'
|
||||
|
||||
class-project.name='w25 cell border cell-with-name'
|
||||
class-project.members='w25 cell border'
|
||||
class-project.captain='w25 cell border cell-with-id-card'
|
||||
class-leaveButton='w25 cell border cell-with-buttons'
|
||||
class-project.name='w280 cell border cell-with-name'
|
||||
class-project.members='w280 cell border'
|
||||
class-project.captain='w280 cell border cell-with-id-card'
|
||||
class-leaveButton='w230 cell border cell-with-buttons'
|
||||
|
||||
action-leaveButton="joinButton"
|
||||
widget-leaveButton="hubl-admin-project-leave-button"
|
||||
action-leaveButton="joinButton"
|
||||
widget-leaveButton="hubl-admin-project-leave-button"
|
||||
|
||||
widget-project.captain='hubl-project-captain'
|
||||
widget-project.members='hubl-project-admins'
|
||||
widget-project.captain='hubl-project-captain'
|
||||
widget-project.members='hubl-project-admins'
|
||||
|
||||
order-by="project.name"
|
||||
)
|
||||
order-by="project.name"
|
||||
)
|
||||
|
||||
sib-widget(name='hubl-admin-project-join-button')
|
||||
template
|
||||
sib-form.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex(
|
||||
data-src='${src}'
|
||||
nested-field="members"
|
||||
sib-widget(name='hubl-admin-project-join-button')
|
||||
template
|
||||
sib-form.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex(
|
||||
data-src='${src}'
|
||||
nested-field="members"
|
||||
|
||||
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.projects || endpoints.get.projects}joinable/`
|
||||
fields='name, members, captain, joinButton'
|
||||
data-src=`${endpoints.projects || endpoints.get.projects}joinable/`
|
||||
fields='name, members, captain, joinButton'
|
||||
|
||||
class-name='w25 cell border cell-with-name'
|
||||
class-members='w25 cell border'
|
||||
class-captain='w25 cell border cell-with-id-card'
|
||||
class-joinButton='w25 cell border cell-with-buttons'
|
||||
class-name='w280 cell border cell-with-name'
|
||||
class-members='w280 cell border'
|
||||
class-captain='w280 cell border cell-with-id-card'
|
||||
class-joinButton='w230 cell border cell-with-buttons'
|
||||
|
||||
action-joinButton="joinButton" # Workaround: I need members two times
|
||||
widget-joinButton="hubl-admin-project-join-button"
|
||||
action-joinButton="joinButton" # Workaround: I need members two times
|
||||
widget-joinButton="hubl-admin-project-join-button"
|
||||
|
||||
widget-captain='hubl-project-captain'
|
||||
widget-members='hubl-project-admins'
|
||||
widget-captain='hubl-project-captain'
|
||||
widget-members='hubl-project-admins'
|
||||
|
||||
order-by="name"
|
||||
)
|
||||
order-by="name"
|
||||
)
|
||||
|
||||
#admin-project-create(hidden)
|
||||
include page-admin-projects-create.pug
|
||||
Reference in New Issue
Block a user