Merge branch 'master' of github.com:noesya/osuny

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

@@ -62,8 +62,17 @@
         <div class="card-header">
           <h5 class="card-title mb-0"><%= t('activerecord.attributes.education/program.team') %></h5>
         </div>
+        <div class="card-body">
+          <%= f.input :contacts, as: :rich_text_area %>
+        </div>
+        <div class="card-body">
+          <%= f.association :teachers,
+                            as: :check_boxes,
+                            collection: current_university.administration_members.teachers.ordered %>
+        </div>
         <div class="card-body">
           <div id="js-program-members">
+            <p>Membres</p>
             <%= f.fields_for :members, program.members, wrapper: false do |member_form| %>
               <div class="row js-program-member fields">
                 <div class="col-md-4">
@@ -88,14 +97,6 @@
           </div>
           <p><%= f.link_to_add "Ajouter un membre", :members, class: 'btn btn-xs btn-primary', data: { target: "#js-program-members" } %></p>
         </div>
-        <div class="card-body">
-          <%= f.association :teachers,
-                            as: :check_boxes,
-                            collection: current_university.administration_members.teachers.ordered %>
-        </div>
-        <div class="card-body">
-          <%= f.input :contacts, as: :rich_text_area %>
-        </div>
       </div>
     </div>
   </div>

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

@@ -17,6 +17,13 @@ teachers:
   - "<%= teacher.id %>"
   <% end %>
 <% end %>
+<% if @program.members.any? %>
+members:
+  <% @program.members.each do |member| %>
+  - member: "<%= member.member_id %>"
+    role: "<%= member.role %>"
+  <% end %>
+<% end %>
 accessibility: >
   <%= prepare_for_github @program.best_accessibility, @program.university %>
 contacts: >