diff --git a/src/templates/hubl-captain.pug b/src/templates/hubl-captain.pug
index 116f04ef47cc82527ad9e25d357431cad46e7adc..fa0a8dbbe55f41394fd476113f62bb1fdb12068f 100644
--- a/src/templates/hubl-captain.pug
+++ b/src/templates/hubl-captain.pug
@@ -11,5 +11,5 @@ sib-widget(name='hubl-captain')
class-is_lead='user-thumb__lead'
widget-account.picture='hubl-user-avatar'
- value-is_lead='Project lead'
+ value-is_lead='Capitaine'
)
diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug
index e038c7c967e0553fb6b5655379a17111bc9996f4..ceb7eeaff83c4a3c5b9c0a5c464a1261bd6b1486 100644
--- a/src/views/admin/page-admin-projects-create.pug
+++ b/src/views/admin/page-admin-projects-create.pug
@@ -12,37 +12,41 @@ div.content-box__info.flex
naked
)
- h1.centered Créer un projet
+ h1 Créer un nouveau projet
sib-form.form.button-register(
data-src=`${endpoints.projects || endpoints.post.projects}`
- fields='line-1(customer, name), line-2(project.description), line-3(businessProvider.name, businessProvider.fee), line-4(captain)'
+ fields='status, line-1(customer.name, name), description, line-10(captain), logo'
- label-customer='Nom du client*'
- class-customer='form-label is-light is-half-width'
- range-customer=`${endpoints.customers || endpoints.get.customers}`
- widget-customer='sib-form-auto-completion'
+ label-status='Statut du canal*'
+ widget-status='hubl-status'
+ class-status='form-label is-light is-full-width member-select color'
- label-name='Nom du projet*'
- class-name='form-label is-light is-half-width input-text-like'
-
- label-project.description='Description du projet'
- class-project.description='form-label is-light is-full-width input-text-like'
- widget-project.description='sib-form-textarea'
+ label-description='Description du projet'
+ class-description='form-label is-light is-full-width'
+ widget-description='sib-form-textarea'
+
+ class-fieldset-captain='fieldset'
+ widget-fieldset-captain='hubl-template-project-title'
- label-businessProvider.name='Apporteur d\'affaire*'
- class-businessProvider.name='form-label is-light is-half-width input-text-like'
+ label-customer.name='Nom du client*'
+ class-customer.name='form-label is-light is-half-width'
- label-businessProvider.fee='Contribution'
- class-businessProvider.fee='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'
- label-captain='Capitaine du projet'
+ label-captain='Capitaine du projet*'
range-captain=`${endpoints.users || endpoints.get.users}`
class-captain='form-label is-light is-half-width'
widget-captain='sib-form-auto-completion'
+ widget-logo="sib-form-file"
+ label-logo="Télécharger un logo"
+ class-logo='form-label is-light is-full-width'
+ upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}`
+
next='admin-project-list'
- submit-button='Enregistrer'
+ submit-button='Enregistrer et ajouter des membres'
)
diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug
index 3323a09f6ebcdf417a4f5055888230184983ed7f..c263c4e9d5ec4d82cb408e059c8011a094622377 100644
--- a/src/views/admin/page-admin-projects.pug
+++ b/src/views/admin/page-admin-projects.pug
@@ -20,79 +20,108 @@
sib-link(
class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
next='admin-project-create'
- ) Créer un projet
-
- .table-wrapper
- .table
- div.table-header.grey-color
- div.w262 Nom
- div.w262 Administrateurs
- div.w262 Capitaines
- div.w262 Accès
-
- 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.is-spaced(
- data-src='${await value}'
- fields='account.picture, sup(name), sub(username)'
-
- class-account.picture='avatar user-thumb__picture'
- class-name='user-thumb__name'
- class-username='user-thumb__username'
-
- 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-admin-project-buttons")
- template
- sib-display(
- data-src='${src}'
- nested-field='members'
- fields='relation'
- action-relation='relation'
- widget-relation='hubl-admin-project-leave-button'
- search-fields='user'
- search-widget-user='sib-form-hidden'
- search-value-user="-"
- hubl-inherit-user-id="search-value-user"
- )
-
- sib-display(
- class='table-body'
-
- data-src=`${endpoints.projects || endpoints.get.projects}`
- fields='name, members, captain, buttons'
-
- class-name='w262 border cell-with-name hashtag'
- class-members='w262 border'
- class-captain='w262 border cell-with-id-card'
- class-buttons='w262 border cell-with-buttons'
-
- widget-buttons="admin-project-buttons"
- action-buttons="buttons"
-
- widget-captain='hubl-project-captain'
- widget-members='hubl-project-admins'
- )
-
- #admin-project-create.content-box__height(hidden)
+ ) Créer un nouveau projet
+
+ .table
+ div.table-header.grey-color
+ div.w25 Nom
+ div.w25 Administrateurs
+ div.w25 Capitaines
+ div.w25 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-project-captain')
+ template
+ sib-display.user-thumb(
+ 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'
+
+ 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-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'
+
+ 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'
+
+ action-leaveButton="joinButton"
+ widget-leaveButton="hubl-admin-project-leave-button"
+
+ widget-project.captain='hubl-project-captain'
+ widget-project.members='hubl-project-admins'
+
+ 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"
+
+ fields='user.username'
+ value-user.username='hubl-workaround-493'
+ widget-user.username='sib-form-hidden'
+
+ submit-button='Rejoindre'
+ )
+
+ sib-display(
+ class='table-body'
+
+ 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'
+
+ 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'
+
+ order-by="name"
+ )
+
+ #admin-project-create(hidden)
include page-admin-projects-create.pug
\ No newline at end of file
diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug
index a9d0411a6bae5541f51fa64b5c936237846f2a27..afefc8860a53302892d87f78dd38e5c1c27dc0b5 100644
--- a/src/views/project/page-project-edit.pug
+++ b/src/views/project/page-project-edit.pug
@@ -9,24 +9,26 @@ div.content-box__info
sib-form.form.button-register(
bind-resources
- fields='line-1(customer, name), description, line-2(businessProvider, businessProviderFee)'
-
- class-customer='form-label is-light is-half-width'
- widget-customer='sib-form-auto-completion'
- class-name='form-label is-light is-half-width input-text-like'
- class-description='form-label is-light is-full-width input-text-like'
- label-customer='Client*'
- range-customer=`${endpoints.customers || endpoints.get.customers}`
+ fields='status, block-project__info(customer.name, name), description'
+
+ label-status='Statut du canal*'
+ widget-status='hubl-status'
+ class-status='form-label is-light is-full-width member-select color'
+
label-name='Nom du projet*'
+ class-name='form-label is-light is-half-width'
+
+ label-customer.name='Nom du client*'
+ class-customer.name='form-label is-light is-half-width'
+
label-description='Description du projet'
+ class-description='form-label is-light is-full-width'
widget-description='sib-form-textarea'
- class-businessprovider='form-label is-light is-half-width input-text-like'
- class-businessproviderfee='form-label is-light is-half-width input-text-like'
- label-businessprovider='Apporteur d\'affaire'
- label-businessproviderfee='Montant de la contribution'
+ partial=""
submit-button='Enregistrer'
+ next='project-information'
)
h2 Liste des membres :
@@ -44,18 +46,18 @@ div.content-box__info
submit-button='Ajouter un membre'
)
- .table-wrapper
- .table
- div.table-header.grey-color
- div.w355 Nom
- div.W152 Accès
-
- //-class='table-body'
- sib-display(
- class='table-body'
- bind-resources
- fields='members'
-
- multiple-members=''
- widget-members='hubl-team-template-edit'
- )
+ .table
+
+ div.table-header.grey-color
+ div.w66 Nom
+ div.w33 Accès
+
+ //-class='table-body'
+ sib-display(
+ class='table-body'
+ bind-resources
+ fields='members'
+
+ multiple-members=''
+ widget-members='hubl-team-template-edit'
+ )
diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug
index bb0f97cc6d61b6d9cee35f22a57dc4870bcc41d7..c734a1890d174c4c5af6823a3ef5d77b90ce661e 100644
--- a/src/views/project/page-project-profile.pug
+++ b/src/views/project/page-project-profile.pug
@@ -21,10 +21,25 @@ sib-router(default-route='project-profile', hidden)
widget-creationDate='sib-display-date'
)
sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
- sib-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
+ sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
+
+ sib-display(
+ class='position-end'
+ bind-resources
+ nested-field='members'
+ fields='relation'
+
+ action-relation='relation'
+ widget-relation='hubl-project-leave-button'
+
+ search-fields='user'
+ search-widget-user='sib-form-hidden'
+ search-value-user=""
-
- .flex.space-between.with-padding
+ hubl-inherit-user-id="search-value-user"
+ )
+
+ .space-between
sib-display(
bind-resources
fields='label-captain, captain'
@@ -51,6 +66,7 @@ sib-router(default-route='project-profile', hidden)
multiple-members
)
+
sib-widget(name='hubl-project-leave-button')
template
sib-delete(
@@ -59,22 +75,5 @@ sib-router(default-route='project-profile', hidden)
data-label='Quitter le groupe'
)
- sib-display(
- class='flex desktop-button__end'
- bind-resources
- nested-field='members'
- fields='relation'
-
- action-relation='relation'
- widget-relation='hubl-project-leave-button'
-
- search-fields='user'
- search-widget-user='sib-form-hidden'
- search-value-user=""
-
- hubl-inherit-user-id="search-value-user"
- )
-
-
#project-edit.content-box__height(hidden)
include page-project-edit.pug