Prospecting guide and images and few minor other things.

2 files changed, 55 insertions, 17 deletions

diff --git a/templates/cave_entrances.html b/templates/cave_entrances.html
index 3a75a02..5b70196 100644
--- a/templates/cave_entrances.html
+++ b/templates/cave_entrances.html
@@ -46,13 +46,13 @@
             <dt>Location</dt><dd>{{ ent.entrance.northing|safe }}, {{ ent.entrance.easting|safe }}, {{ ent.entrance.alt|safe }}m</dd>
         {% endif %}
         {% if ent.entrance.tag_station %}
-            <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }}{{ ent.entrance.tag.y|safe }}, {{ ent.entrance.tag.x|safe }}, {{ ent.entrance.tag.z|safe }}m</dd>
+            <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} {{ ent.entrance.tag.y|safe }}, {{ ent.entrance.tag.x|safe }}, {{ ent.entrance.tag.z|safe }}m</dd>
         {% endif %}
         {% if ent.entrance.bearings %}
             <dt>Bearings</dt><dd>{{ ent.entrance.bearings|safe }}</dd>
         {% endif %}
         {% if ent.entrance.exact_station %}
-            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }} {{ ent.exact_location.tag.y|safe }}, {{ ent.entrance.exact_location.x|safe }}, {{ ent.entrance.exact_location.z|safe }}m</dd>
+            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }} {{ ent.entrance.exact_location.y|safe }}, {{ ent.entrance.exact_location.x|safe }}, {{ ent.entrance.exact_location.z|safe }}m</dd>
         {% endif %}
         {% if ent.entrance.other_station %}
             <dt>Other Station</dt><dd>{{ ent.entrance.other_station|safe }}
diff --git a/templates/prospecting.html b/templates/prospecting.html
index 0d7a0d6..a2ab512 100644
--- a/templates/prospecting.html
+++ b/templates/prospecting.html
@@ -11,18 +11,18 @@
 <li>For more info on each cave, see the links to detailed description pages.</li>
 </ul>
 
-{% for name, area in areas %}
+{% for name, area, caves in areas %}
  <h2>{{name|safe}}</h2>
- <table border=\"1\" width="100%">
- <col><col><col><col><col><col><col><col><col width="45%">
+ <table border="1" width="100%">
+ <col><col><col><col><col><col><col><col><col>
  <thead>
- <tr><th>Cave Number</th><th>Name</th><th>Finished</th><th>Survey<br>Data</th><th>Survey<br>Drawn</th><th>Marked</th><th>Photo</th><th>Position</th><th>Location</th></tr>
+ <tr><th>Cave Number</th><th>Name</th><th>Finished</th><th>Survey<br>Data</th><th>Survey<br>Drawn</th><th>Marked</th><th>Photo</th><th>Position</th></tr>
  </thead>
  <tbody>  
- {% for cave in area.cave_set.all %}
+ {% for cave in caves %}
   {% if cave.singleentrance %}
    <tr{% if cave.ours %} class="ours"{% else %} class="notours"{% endif %}>
-     <td>{{ cave }}</td>
+     <td><a href="/{{ cave.url }}">{{ cave }}</a></td>
      <td>{{ cave.official_name|safe }}</td>
      <td>{{ cave.kataster_code }}</td>
      <td>{{ cave.hassurveydata }}</td>
@@ -30,13 +30,32 @@
      <td>{{ cave.caveandentrance_set.all.0.entrance.marking_val }}</td>
      <td>{{ cave.caveandentrance_set.all.0.entrance.has_photo }} </td>
      <td>{{ cave.caveandentrance_set.all.0.entrance.find_location }}</td>
-     <td>{% if cave.caveandentrance_set.all.0.entrance.location_description %}Location: {{ cave.caveandentrance_set.all.0.entrance.location_description|safe }}{% endif %}
-         {% if cave.caveandentrance_set.all.0.entrance.map_description %}Map: {{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}{% endif %}	
-         {% if cave.caveandentrance_set.all.0.entrance.approach %}Approach: {{ cave.caveandentrance_set.all.0.entrance.approach|safe }}{% endif %}</td>
    </tr>
+   {% if cave.caveandentrance_set.all.0.entrance.location_description %}
+       <tr><th>Location</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.location_description|safe }}</td></tr>
+   {% endif %}
+   {% if cave.caveandentrance_set.all.0.entrance.map_description %}
+       <tr><th>Map</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}</td></tr>
+   {% endif %}	
+   {% if cave.caveandentrance_set.all.0.entrance.approach %}
+       <tr><th>Approach</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.approach|safe }}</td></tr>
+   {% endif %}
+   {% if cave.caveandentrance_set.all.0.entrance.findability_description %}
+       <tr><th>Findability</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.findability_description|safe }}</td></tr>
+   {% endif %}
+   {% if cave.caveandentrance_set.all.0.entrance.marking_comment %}
+       <tr><th>Marking</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.marking_comment|safe }}</td></tr>
+   {% endif %}
+   {% if cave.caveandentrance_set.all.0.entrance.entrance_description %}
+       <tr><th>Ent Desc</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.entrance_description|safe }}</td></tr>
+   {% endif %}
+   {% if cave.underground_description %}
+       <tr><th>Under Desc</th><td colspan="9">{{ cave.underground_description|truncatewords_html:80 }}</td></tr>
+   {% endif %}
+
   {% else %}
    <tr{% if cave.ours %} class="ours"{% else %} class="notours"{% endif %}>
-     <td>{{ cave }}</td>
+     <td><a href="/{{ cave.url }}">{{ cave }}</a></td>
      <td>{{ cave.official_name|safe }}</td>
      <td>{{ cave.kataster_code }}</td>
      <td>{{ cave.hassurveydata }}</td>
@@ -46,20 +65,39 @@
      <td></td>
      <td></td>
     </tr>
+   {% if cave.underground_description %}
+       <tr><th>Under Desc</th><td colspan="9">{{ cave.underground_description|truncatewords_html:80 }}</td></tr>
+   {% endif %}
    {% for caveandentrance in cave.caveandentrance_set.all %} 
     <tr{% if cave.ours %} class="ours"{% else %} class="notours"{% endif %}>
-     <td>{{ caveandentrance.entrance_letter}}</td>
+     <td><a href="/{{ cave.url }}">{{ caveandentrance.entrance_letter}}</a></td>
      <td>{{ caveandentrance.entrance.name|safe }}</td>
      <td></td>
      <td></td>
      <td></td>
      <td>{{ caveandentrance.entrance.marking_val }}</td>
      <td>{{ caveandentrance.entrance.has_photo }} </td>
-     <td>{{ caveandentrance.entrance.find_location|safe }}</td>
-     <td>{% if cave.caveandentrance_set.all.0.entrance.location_description %}Location: {{ cave.caveandentrance_set.all.0.entrance.location_description|safe }}{% endif %}
-         {% if cave.caveandentrance_set.all.0.entrance.map_description %}Map: {{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}{% endif %}
-         {% if cave.caveandentrance_set.all.0.entrance.approach %}Approach: {{ cave.caveandentrance_set.all.0.entrance.approach|safe }}{% endif %}</td>
+     <td>{{ caveandentrance.entrance.find_location|safe }}</td> 
     </tr>
+    <tr>
+    {% if caveandentrance.entrance.location_description %}
+      <tr><td>Location</td><td colspan="9">{{ caveandentrance.entrance.location_description|safe }}</td></tr>
+    {% endif %}
+    {% if caveandentrance.entrance.map_description %}
+      <tr><td>Map</td><td colspan="9">{{ caveandentrance.entrance.map_description|safe }}</td></tr>
+    {% endif %}
+    {% if caveandentrance.entrance.approach %}
+      <tr><td>Approach</td><td colspan="9">{{ caveandentrance.entrance.approach|safe }}</td></tr>
+    {% endif %}
+    {% if caveandentrance.entrance.findability_description %}
+        <tr><th>Findability</th><td colspan="9">{{ caveandentrance.entrance.findability_description|safe }}</td></tr>
+    {% endif %}
+   {% if caveandentrance.entrance.marking_comment %}
+       <tr><th>Marking</th><td colspan="9">{{ caveandentrance.entrance.marking_comment|safe }}</td></tr>
+   {% endif %}
+   {% if cave.caveandentrance_set.all.0.entrance.entrance_description %}
+       <tr><th>Ent Desc</th><td colspan="9">{{ caveandentrance.entrance.entrance_description|safe }}</td></tr>
+   {% endif %}
    {% endfor %}
   {% endif %}
  {% endfor %}