Bug fixing of cave and entrance forms removal of slugs

templates/cave_entrances.html

@@ -7,7 +7,7 @@
         {{ ent.entrance_letter|safe }}
         {% if ent.entrance.name %}
             {{ ent.entrance.name|safe }}
-        {% endif %}<a href="{% url editentrance ent.entrance.slug %}">Edit</a>
+        {% endif %}<a href="{% url editentrance cave.slug ent.entrance.slug %}">Edit</a>
         <dl>
         {% if ent.entrance.marking %}
             <dt>Marking</dt><dd>{{ ent.entrance.marking_val|safe }}</dd>
@@ -67,5 +67,5 @@
     </ul>
 
 {% endif %}</p>
-<a href="{% url newentrance %}">New Entrance</a>
+<a href="{% url newentrance cave.slug %}">New Entrance</a>
 	</div>

templates/editentrance.html

@@ -10,7 +10,7 @@
 {% endblock %}
 {% block content %}
 <form action="" method="post">{% csrf_token %}
-    <table>{{ form }}</table>
+    <table>{{entletter}}{{ form }}</table>
     {{ versionControlForm }}
     <p><input type="submit" value="Submit" /></p>
 </form>

templates/prospecting.html

@@ -14,7 +14,7 @@
 {% for name, area in areas %}
  <h2>{{name|safe}}</h2>
  <table border=\"1\" width="100%">
- <col><col><col><col><col><col><col><col><col width="35%">
+ <col><col><col><col><col><col><col><col><col width="45%">
  <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>
  </thead>
@@ -31,7 +31,7 @@
      <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.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>
   {% else %}