Merge branch 'main' into university_features

app/views/extranet/alumni/academic_years/index.html.erb

 <% content_for :title, Education::AcademicYear.model_name.human(count: 2) %>
 <% content_for :header_right do %>
+  <p>
     <%= @count %>
     <%= Education::AcademicYear.model_name.human(count: @count).downcase %>
+  </p>
 <% end %>
 
 <ul class="years">

app/views/extranet/alumni/academic_years/show.html.erb

 <% content_for :title, @academic_year %>
 <% content_for :header_right do %>
-  <%= @alumni.count %>
-  <%= University::Person::Alumnus.model_name.human(count: @alumni.count).downcase %>
+  <p>
+    <%= @alumni.count %>
+    <%= University::Person::Alumnus.model_name.human(count: @alumni.count).downcase %>
+  </p>
 <% end %>
 
 <div class="row">

app/views/extranet/alumni/cohorts/index.html.erb

 <% content_for :title, Education::Cohort.model_name.human(count: 2) %>
 <% content_for :header_right do %>
-  <%= @count %>
-  <%= Education::Cohort.model_name.human(count: @count).downcase %>
+  <p>
+    <%= @count %>
+    <%= Education::Cohort.model_name.human(count: @count).downcase %>
+  </p>
 <% end %>
 
 <% if current_extranet.should_show_years? %>

app/views/extranet/alumni/cohorts/show.html.erb

 <% content_for :title, @cohort %>
 <% content_for :header_right do %>
+<p>
   <%= @cohort.people.count %>
   <%= University::Person::Alumnus.model_name.human(count: @cohort.people.count).downcase %>
+</p>
 <% end %>
 
 <p class="mb-5">

app/views/extranet/alumni/organizations/index.html.erb

 <% content_for :title, University::Organization.model_name.human(count: 2) %>
 <% content_for :header_right do %>
+<p>
   <%= @count %>
   <%= University::Organization.model_name.human(count: @count).downcase %>
+</p>
 <% end %>
 
 <div class="row">

app/views/extranet/alumni/persons/index.html.erb

 <% content_for :title, University::Person.model_name.human(count: 2) %>
 <% content_for :header_right do %>
+<p>
   <%= @count %>
   <%= University::Person.model_name.human(count: @count).downcase %>
+</p>
 <% end %>
 
 <div class="row">

app/views/extranet/application/_header.html.erb

@@ -5,13 +5,13 @@
       <%= yield :header %>
     <% else %>
       <h1><%= yield :title %></h1>
-      <p class="header__additional_data">
+      <div class="header__additional_data">
         <% if content_for(:header_right).present? %>
           <%= yield :header_right %>
         <% else %>
           &nbsp;
         <% end %>
-      </p>
+      </div>
     <% end %>
   </div>
 </header>
\ No newline at end of file

app/views/extranet/contacts/organizations/index.html.erb

 <% content_for :title, University::Organization.model_name.human(count: 2) %>
 <% content_for :header_right do %>
-  <%= @count %>
-  <%= University::Organization.model_name.human(count: @count).downcase %>
+  <p>
+    <%= @count %>
+    <%= University::Organization.model_name.human(count: @count).downcase %>
+  </p>
 <% end %>
 
 <%= render "extranet/contacts/organizations/list" %>

app/views/extranet/contacts/persons/index.html.erb

 <% content_for :title, University::Person.model_name.human(count: 2) %>
 <% content_for :header_right do %>
-  <%= @count %>
-  <%= University::Person.model_name.human(count: @count).downcase %>
+  <p>
+    <%= @count %>
+    <%= University::Person.model_name.human(count: @count).downcase %>
+  </p>
 <% end %>
 
 <div class="row">