better persons management

app/views/admin/communication/websites/_sidebar.html.erb

@@ -9,11 +9,6 @@
             path: admin_communication_website_path(id: @website),
             ability: can?(:read, @website)
           },
-          {
-            title: Communication::Website::Post.model_name.human(count: 2),
-            path: admin_communication_website_posts_path(website_id: @website),
-            ability: can?(:read, Communication::Website::Post)
-          },
           {
             title: Communication::Website::Home.model_name.human,
             path: admin_communication_website_home_path(website_id: @website),
@@ -24,6 +19,11 @@
             path: admin_communication_website_pages_path(website_id: @website),
             ability: can?(:read, Communication::Website::Page)
           },
+          {
+            title: Communication::Website::Post.model_name.human(count: 2),
+            path: admin_communication_website_posts_path(website_id: @website),
+            ability: can?(:read, Communication::Website::Post)
+          },
           {
             title: Communication::Website::Category.model_name.human(count: 2),
             path: admin_communication_website_categories_path(website_id: @website),

app/views/admin/education/program/roles/_form.html.erb

@@ -8,7 +8,7 @@
           <h5 class="card-title mb-0"><%= t('admin.infos') %></h5>
         </div>
         <div class="card-body">
-          <%= f.input :description %>
+          <%= f.input :description, as: :string %>
         </div>
       </div>
     </div>

app/views/admin/education/program/teachers/_form.html.erb

@@ -11,7 +11,7 @@
           <%= f.association :person, collection: @available_people %>
         </div>
         <div class="col-md-6">
-          <%= f.input :description %>
+          <%= f.input :description, as: :string %>
         </div>
       </div>
     </div>

app/views/admin/education/programs/_form.html.erb

@@ -66,26 +66,40 @@
       <h5 class="card-title mb-0"><%= t('activerecord.attributes.education/program.team') %></h5>
     </div>
     <div class="card-body">
-      <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :contacts %>
+      <div class="row">
+        <div class="col-md-4">
+          <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :contacts %>
+        </div>
+        <div class="col-md-8 clearfix">
+          <div class="row mb-2">
+            <div class="col-md-8">
+              <label class="form-label"><%= Education::Program.human_attribute_name('teachers') %></label>
+            </div>
+            <div class="col-md-4 text-end">
+              <%= link_to_add_association t('add'),
+                                          f,
+                                          :university_person_involvements,
+                                          class: button_classes,
+                                          partial: 'admin/education/programs/involvement_fields',
+                                          data: {
+                                            'association-insertion-method': 'append',
+                                            'association-insertion-node':   '#involvements',
+                                          } %>
+            </div>
+          </div>
 
-      <p><%= Education::Program.human_attribute_name('teachers') %></p>
-      <%= link_to_add_association t('add'), f, :university_person_involvements,
-                                  class: "btn btn-primary mb-3",
-                                  partial: 'admin/education/programs/involvement_fields',
-                                  data: {
-                                    'association-insertion-method': 'append',
-                                    'association-insertion-node':   '#involvements',
-                                  } %>
+          <div id="involvements">
+            <%
+            sorted_involvements = program.university_person_involvements.sort_by { |involvement|
+              [involvement.person&.last_name, involvement.person&.first_name]
+            }
+            %>
+            <%= f.simple_fields_for :university_person_involvements, sorted_involvements, include_id: false do |involvement_f| %>
+              <%= render 'admin/education/programs/involvement_fields', f: involvement_f, include_id: true %>
+            <% end %>
+          </div>
 
-      <div class="row mb-3" id="involvements">
-        <%
-        sorted_involvements = program.university_person_involvements.sort_by { |involvement|
-          [involvement.person&.last_name, involvement.person&.first_name]
-        }
-        %>
-        <%= f.simple_fields_for :university_person_involvements, sorted_involvements, include_id: false do |involvement_f| %>
-          <%= render 'admin/education/programs/involvement_fields', f: involvement_f, include_id: true %>
-        <% end %>
+        </div>
       </div>
     </div>
   </div>

app/views/admin/education/programs/_involvement_fields.html.erb

 <% include_id ||= false %>
-<div class="nested-fields col-md-3">
-  <div class="card mb-2">
-    <div class="card-body">
-      <div class="row align-items-center">
-        <div class="col-10">
-          <%= f.association :person, collection: @teacher_people, label: false, include_blank: :translate, required: true %>
-          <%= f.input :description, label: false, placeholder: University::Person::Involvement.human_attribute_name('description'), wrapper: false %>
-        </div>
-        <div class="col-2">
-          <%= link_to_remove_association '<i class="fas fa-trash"></i>'.html_safe, f, class: 'btn btn-sm btn-danger' %>
-        </div>
+<div class="nested-fields">
+    <div class="row">
+      <div class="col-md-5">
+        <%= f.association :person,
+                          collection: @teacher_people,
+                          label: false,
+                          include_blank: :translate,
+                          required: true %>
+      </div>
+      <div class="col-md-6">
+        <%= f.input :description,
+                    as: :string,
+                    label: false,
+                    placeholder: University::Person::Involvement.human_attribute_name('description'),
+                    wrapper: false %>
+      </div>
+      <div class="col-md-1 text-end">
+        <%= link_to_remove_association  '<i class="fas fa-trash"></i>'.html_safe,
+                                        f,
+                                        class: 'btn btn-sm btn-danger' %>
       </div>
     </div>
-    <%= f.hidden_field :id if include_id %>
   </div>
+  <%= f.hidden_field :id if include_id %>
 </div>

app/views/admin/education/school/roles/_form.html.erb

@@ -9,7 +9,7 @@
           <h5 class="card-title mb-0"><%= t('admin.infos') %></h5>
         </div>
         <div class="card-body">
-          <%= f.input :description %>
+          <%= f.input :description, as: :string %>
         </div>
       </div>
     </div>