1 files changed, 16 insertions, 12 deletions
diff --git a/templates/expedition.html b/templates/expedition.html
index 0188107..eda8fde 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -27,10 +27,10 @@
 {% endif %}
 
 <p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips.  
-The columns are the date in the month (July or August), with a 
+The columns are the date in the month (July, August or September), Sundays in blue, with a 
 "<b>T</b>" for a logbook entry, and 
-an "<b>S</b>" for a survey trip.  The colours are the same for people on the same trip. </p>
-<!-- Colours are set in trog3.css and there can be 3 trips a day of each type-->
+an "<b>S</b>" for a survey trip.  The colours of the "<b>T</b>" and "<b>S</b>" are the same for people on the same trip. </p>
+<!-- Colours are set in trog3.css and there can be 10 trips a day of each type-->
 
 <table class="expeditionpersonlist">
 <tr>
@@ -44,21 +44,25 @@ an "<b>S</b>" for a survey trip.  The colours are the same for people on the sam
 {% for personexpeditionday in personexpeditiondays %}
   <tr>
   <td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person|safe}}</a></td>
-  {% for persondayactivities in personexpeditionday.personrow %}
+  {% for activities in personexpeditionday.personrow %}
 
-  {% if persondayactivities.persontrips or persondayactivities.survexblocks %}
-  <td class="persondayactivity">
-    {% for persontrip in persondayactivities.persontrips %}
-      <a href="{{persontrip.logbook_entry.get_absolute_url}}" class="dayindexlog-{{persontrip.logbook_entry.DayIndex}}">T</a>
+  {% if activities.personentries or activities.survexblocks %}
+    <td class="persondayactivity">
+    {% for personentry in activities.personentries %}
+      <a href="{{personentry.logbook_entry.get_absolute_url}}" class="dayindexlog-{{personentry.logbook_entry.DayIndex}}">T</a>
     {% endfor %}
-   <br/>
-    {% for survexblock in persondayactivities.survexblocks %}
+    <br/>
+    {% for survexblock in activities.survexblocks %}
       <a href="{% url "svx" survexblock.survexfile.path %}" class="dayindexsurvex-{{survexblock.DayIndex}}">S</a>
     {% endfor %}
   </td>
   {% else %}
-  <td class="persondayactivity-nothing">
-  </td>
+      {% if activities.sunday   %}
+      <td class="persondayactivity-sunday">
+      {% else %}
+      <td class="persondayactivity-nothing">
+      {% endif %}
+      </td>
   {% endif %}
 
   {% endfor %}