1 files changed, 16 insertions, 6 deletions

diff --git a/app/views/custom/page_templates/public/chapter_detail.html.erb b/app/views/custom/page_templates/public/chapter_detail.html.erb
index 71352d3..f47353c 100644
--- a/app/views/custom/page_templates/public/chapter_detail.html.erb
+++ b/app/views/custom/page_templates/public/chapter_detail.html.erb
@@ -5,16 +5,26 @@
   <% end %>
   <p><%= sanitize(@page.abstract) %></p>
   <%= aggregate?(@page.body) %>
-  <% if @page.node.events.any? %>
+  <% open_days = @page.node.events.tagged_with('open-day').order(:start_time) %>
+  <% other_events = @page.node.events.where.not(id: open_days.map(&:id)).order(:start_time) %>
+  <% if open_days.any? %>
+    <div class="chapter_events open_days">
+      <h3><%= t(:open_days) %></h3>
+      <ul>
+        <% open_days.each do |event| %>
+          <li><%= event_schedule_text(event) %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <% if other_events.any? %>
     <div class="chapter_events">
-      <h3>Events</h3>
+      <h3><%= t(:upcoming_events) %></h3>
       <ul>
-        <% @page.node.events.order(:start_time).each do |event| %>
+        <% other_events.each do |event| %>
           <li>
             <span class="event_title"><%= event.display_title %></span>
-            <% if event.rrule.present? %>
-              <span class="event_rrule"><%= event.rrule %></span>
-            <% end %>
+            <span class="event_schedule"><%= event_schedule_text(event) %></span>
           </li>
         <% end %>
       </ul>