1 files changed, 19 insertions, 21 deletions

diff --git a/templates/entrance.html b/templates/entrance.html
index a59410c..dcd2970 100644
--- a/templates/entrance.html
+++ b/templates/entrance.html
@@ -1,79 +1,77 @@
 {% extends "base.html" %}
-{% load wiki_markup %}
-
-{% block title %}{{ cave.official_name|wiki_to_html }} - {{ entrance_letter|wiki_to_html }}{% endblock %}
+{% block title %}{{ cave.official_name|safe }} - {{ entrance_letter|safe }}{% endblock %}
 
 {% block content %}
 <table id="cavepage">
 <tr>
     <th id="kat_no">
         {% if cave.kataster_number %}
-            {{ cave.kataster_number|wiki_to_html }}{{ letter|wiki_to_html }}
+            {{ cave.kataster_number|safe }}{{ letter|safe }}
             {% if cave.unofficial_number %}
-                <br />({{ cave.unofficial_number|wiki_to_html }})
+                <br />({{ cave.unofficial_number|safe }})
             {% endif %}
         {% endif %}
     </th>
     <th id="name">
          {% if entrance.name %}
-         {{ entrance.name|wiki_to_html }}
+         {{ entrance.name|safe }}
          {% else %}
              Unnamed
-         {% endif %} - {{ cave.official_name|wiki_to_html }}
+         {% endif %} - {{ cave.official_name|safe }}
     </th>
     <th id="status">
-         {{ cave.kataster_code|wiki_to_html }}
+         {{ cave.kataster_code|safe }}
     </th>
 </tr>
 </table>
 
 {% if entrance.entrance_description %}
     <h2>Entrance Description</h2>
-    {{ entrance.entrance_description|wiki_to_html }}
+    {{ entrance.entrance_description|safe }}
 {% endif %}
 {% if entrance.explorers %}
     <h2>Explorers</h2>
-    {{ entrance.explorers|wiki_to_html }}
+    {{ entrance.explorers|safe }}
 {% endif %}
 {% if entrance.map_description %}
     <h2>Map</h2>
-    {{ entrance.map_description|wiki_to_html }}
+    {{ entrance.map_description|safe }}
 {% endif %}
 {% if entrance.explorers %}
     <h2>Entrance Description</h2>
-    {{ entrance.entrance_description|wiki_to_html }}
+    {{ entrance.entrance_description|safe }}
 {% endif %}
 {% if entrance.location_description %}
     <h2>Location Description</h2>
-    {{ entrance.location_description|wiki_to_html }}
+    {{ entrance.location_description|safe }}
 {% endif %}
 {% if entrance.approach %}
     <h2>Approach</h2>
-    {{ entrance.approach|wiki_to_html }}
+    {{ entrance.approach|safe }}
 {% endif %}
 {% if entrance.underground_description %}
     <h2>Underground Description</h2>
-    {{ entrance.underground_description|wiki_to_html }}
+    {{ entrance.underground_description|safe }}
 {% endif %}
 {% if entrance.photo %}
     <h2>Photo</h2>
-    {{ entrance.photo|wiki_to_html }}
+    {{ entrance.photo|safe }}
 {% endif %}
 {% if entrance.marking %}
-    <h2>Marking - {{ entrance.marking_val|wiki_to_html }}</h2>
+    <h2>Marking - {{ entrance.marking_val|safe }}</h2>
     {% if entrance.marking_comment %}
-        {{ entrance.marking_comment|wiki_to_html }}
+        {{ entrance.marking_comment|safe }}
     {% endif %}
 {% endif %}
 {% if entrance.findability %}
-    <h2>Findability - {{ entrance.findability_val|wiki_to_html }}</h2>
+    <h2>Findability - {{ entrance.findability_val|safe }}</h2>
     {% if entrance.findability_description %}
-        {{ entrance.findability_description|wiki_to_html }}
+        {{ entrance.findability_description|safe }}
     {% endif %}
 {% endif %}
 {% if entrance.bearings %}
     <h2>Bearings</h2>
-    {{ entrance.bearings|wiki_to_html }}
+    {{ entrance.bearings|safe }}
 {% endif %}
 
 {% endblock %}