3 files changed, 8 insertions, 4 deletions
diff --git a/templates/cave.html b/templates/cave.html
index 416a450..7cbeef2 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -541,7 +541,7 @@ div#scene {
         {{ ent.entrance_letter|safe }}
         {% if ent.entrance.name %}
             {{ ent.entrance.name|safe }}
-        {% endif %}<a href="{% url "editentrance" cave.slug ent.entrance.slug %}">Edit</a>
+        {% endif %}<a href="{% url "editentrance" ent.entrance.url_parent cave.slug ent.entrance.slug %}">Edit</a>
         <dl>
         {% if ent.entrance.marking %}
             <dt>Marking</dt><dd>{{ ent.entrance.marking_val|safe }}</dd>
@@ -601,6 +601,6 @@ div#scene {
     </ul>
 
 {% endif %}</p>
-<a href="{% url "newentrance" cave.slug %}">New Entrance</a>
+<a href="{% url "newentrance" cave.url_parent cave.slug %}">New Entrance</a>
 </div>
 {% endblock content %}
diff --git a/templates/editentrance.html b/templates/editentrance.html
index 83273ff..138abeb 100644
--- a/templates/editentrance.html
+++ b/templates/editentrance.html
@@ -8,8 +8,12 @@
 <h1>Edit Entrance - at cave {{cave.official_name|safe}} - {{cave.kataster_number}}</h1>
 {% include 'html_editor_pop_ups.html' %}
 <h2>{{message}}</h2>
-<p>{{entletter}}
 <form action="" method="post">{% csrf_token %}
+    {% if entlettereditable %}
+      <table>{{ entletter }}</table>
+    {% else %}
+      <table><tr><th>Entrance Letter</th><td>{{ entletter }}</td></table>
+    {% endif %}
     <table>{{ form }}</table>
     {{ versionControlForm }}
     <p><input type="submit" value="Submit" /></p>
diff --git a/templates/menu.html b/templates/menu.html
index 2dd44f6..8953eed 100644
--- a/templates/menu.html
+++ b/templates/menu.html
@@ -43,7 +43,7 @@
     <input id="omega-autofocus" type=search name=P size=8 autofocus>
     <input type=submit value="Search"></form></li>
 {% if editable %}<li><a href="{% url "editexpopage" path %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %}
-{% if cave_editable %}<li><a href="{% url "edit_cave" cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %}
+{% if cave_editable %}<li><a href="{% url "edit_cave" cave.url_parent cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %}
 </ul>
 </div>
 {% endif %}