3 files changed, 16 insertions, 11 deletions
diff --git a/templates/errors/generic.html b/templates/errors/generic.html
index 66655a1..19bed46 100644
--- a/templates/errors/generic.html
+++ b/templates/errors/generic.html
@@ -13,7 +13,15 @@
 	<div class='space'></div>
 	<div class='align-center'>
 		<h3>There has been an error.</h3>
-		<p>We are terribly sorry but an unknown fault has occurred. </p>
+        
+        
+        
+        {% if message %}
+            {{message}}
+        {% else %}
+            <p>We are terribly sorry but an unknown fault has occurred. </p>
+        
+        {% endif %})
 
 
 	</div>
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 1af88bd..9407e72 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!-- logbookentry.html - this text visible because this template has been included -->
 {% load wiki_markup %}
 
 {% block title %}Logbook {{logbookentry.id}}{% endblock %}
@@ -10,12 +11,14 @@
 <h2>{{logbookentry.title|safe}}</h2>
 
 <div id="related">
-<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p>
+<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="/years/{{logbookentry.expedition.logbookfile}}">Full logbook</a>
+</p>
 
 {% if logbookentry.cave %}
   <p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</p>
 {% else %}
-  <p>{{logbookentry.place}}</p>
+  <p>{{logbookentry.place|safe}}</p>
 {% endif %}
 
 <p>
@@ -67,16 +70,9 @@
 <div id="col1">
   <div class="logbookentry">
     <b>{{logbookentry.date|date:"D d M Y"}}</b>
-    {% if logbookentry.entry_type == "html" %}
-      <p>{{logbookentry.text|safe}}</p>
-    {% else %}
-      {{logbookentry.text|wiki_to_html}}
-    {% endif %}
+    <p>{{logbookentry.text|safe}}</p>
   </div>
 </div>
 </div>
 
-{% if logbookentry.filename %}<a href="{% url "editLogBookEntry" expeditionyear=logbookentry.expedition.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url "deleteLogBookEntry" expeditionyear=logbookentry.expedition.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%}
-
-
 {% endblock %}
diff --git a/templates/newlogbookentry.html b/templates/newlogbookentry.html
index fdb4cbd..bdb0919 100644
--- a/templates/newlogbookentry.html
+++ b/templates/newlogbookentry.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!-- logbookentry.html - this text visible because this template has been included -->
 {% load csrffaker %} 
 {% block title %}Logbook {{logbookentry.id}}{% endblock %}
 {% block head %}