Merge branch 'release/project' into release/rework-css

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)'
+	  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'
 
-    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}`
     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
+  .table
 
-      //-class='table-body'
-      sib-display(
-        class='table-body'
-        bind-resources
-        fields='members'
+    div.table-header.grey-color
+      div.w66 Nom
+      div.w33 Accès
 
-        multiple-members=''
-        widget-members='hubl-team-template-edit'
-      )
+    //-class='table-body'
+    sib-display(
+      class='table-body'
+      bind-resources
+      fields='members'
+
+      multiple-members=''
+      widget-members='hubl-team-template-edit'
+    )

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'
 
-    
-    .flex.space-between.with-padding
+        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"
+    )
+
+    .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