diff options
-rw-r--r-- | templates/404.html | 2 | ||||
-rw-r--r-- | templates/cave.html | 2 | ||||
-rw-r--r-- | templates/cave_description.html | 2 | ||||
-rw-r--r-- | templates/caveindex.html | 2 | ||||
-rw-r--r-- | templates/cavemillenial.html | 2 | ||||
-rw-r--r-- | templates/entrance.html | 2 | ||||
-rw-r--r-- | templates/expedition.html | 2 | ||||
-rw-r--r-- | templates/frontpage.html | 2 | ||||
-rw-r--r-- | templates/logbookentry.html | 2 | ||||
-rw-r--r-- | templates/manyscansfolders.html | 2 | ||||
-rw-r--r-- | templates/pathsreport.html | 2 | ||||
-rw-r--r-- | templates/person.html | 2 | ||||
-rw-r--r-- | templates/personexpedition.html | 2 | ||||
-rw-r--r-- | templates/personindex.html | 2 | ||||
-rw-r--r-- | templates/qm.html | 2 | ||||
-rw-r--r-- | templates/scansfolder.html | 2 | ||||
-rw-r--r-- | templates/statistics.html | 2 | ||||
-rw-r--r-- | templates/subcave.html | 2 | ||||
-rw-r--r-- | templates/svxcaveseveral.html | 8 | ||||
-rw-r--r-- | templates/svxcavesingle.html | 2 | ||||
-rw-r--r-- | templates/svxcavesingle404.html | 2 | ||||
-rw-r--r-- | templates/svxfilecavelist.html | 2 | ||||
-rw-r--r-- | templates/tasks.html | 2 | ||||
-rw-r--r-- | templates/tunnelfiles.html | 2 |
24 files changed, 27 insertions, 27 deletions
diff --git a/templates/404.html b/templates/404.html index 36246de..fc0dd67 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}List of survex files{% endblock %} diff --git a/templates/cave.html b/templates/cave.html index 8dfdd78..0ccef4b 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -433,7 +433,7 @@ div#scene { {% endblock %} -{% load wiki_markup %} + {% block content %} {% block contentheader %} <table id="cavepage"> diff --git a/templates/cave_description.html b/templates/cave_description.html index 7105963..663096b 100644 --- a/templates/cave_description.html +++ b/templates/cave_description.html @@ -1,5 +1,5 @@ {% extends "cavebase.html" %} -{% load wiki_markup %} + {% block title %} {{cave_description}} {% endblock title %} {% block editLink %}<a href={{cave_description.get_admin_url}}>Edit description {{cave_description}}</a>{% endblock %} diff --git a/templates/caveindex.html b/templates/caveindex.html index e8d701c..817ec5c 100644 --- a/templates/caveindex.html +++ b/templates/caveindex.html @@ -1,5 +1,5 @@ {% extends "cavebase.html" %} -{% load wiki_markup %} + {% block title %}Cave Index{% endblock %} diff --git a/templates/cavemillenial.html b/templates/cavemillenial.html index 4967d93..6c96ed8 100644 --- a/templates/cavemillenial.html +++ b/templates/cavemillenial.html @@ -1,5 +1,5 @@ {% extends "cavebase.html" %} -{% load wiki_markup %} + {% block title %}Cave Index{% endblock %} diff --git a/templates/entrance.html b/templates/entrance.html index 29d0131..b148837 100644 --- a/templates/entrance.html +++ b/templates/entrance.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% block title %}{{ cave.official_name|wiki_to_html }} - {{ entrance_letter|wiki_to_html }}{% endblock %} diff --git a/templates/expedition.html b/templates/expedition.html index a93215b..f8a38fc 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}Expedition {{expedition.name}}{% endblock %} diff --git a/templates/frontpage.html b/templates/frontpage.html index 534602d..eca67cb 100644 --- a/templates/frontpage.html +++ b/templates/frontpage.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% block title %}Cambridge Expeditions to Austria{% endblock %} diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 5691c4e..c8ed439 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% block title %}Logbook {{logbookentry.id}}{% endblock %} {% block editLink %}<a href={{logbookentry.get_admin_url}}/>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %} diff --git a/templates/manyscansfolders.html b/templates/manyscansfolders.html index c392af9..e7940bf 100644 --- a/templates/manyscansfolders.html +++ b/templates/manyscansfolders.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load survex_markup %} {% block title %}All Survey scans folders (wallets){% endblock %} diff --git a/templates/pathsreport.html b/templates/pathsreport.html index f22f1ef..15e7f37 100644 --- a/templates/pathsreport.html +++ b/templates/pathsreport.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}Troggle paths report{% endblock %} diff --git a/templates/person.html b/templates/person.html index 48dafb7..573c194 100644 --- a/templates/person.html +++ b/templates/person.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% block title %}Person {{person|wiki_to_html_short}}{% endblock %} diff --git a/templates/personexpedition.html b/templates/personexpedition.html index 3c9ca11..ddaad35 100644 --- a/templates/personexpedition.html +++ b/templates/personexpedition.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}Person {{personexpedition.person|wiki_to_html_short}} for {{personexpedition.expedition}}{% endblock %} diff --git a/templates/personindex.html b/templates/personindex.html index e21d7e6..0a0405b 100644 --- a/templates/personindex.html +++ b/templates/personindex.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% block title %}Person Index{% endblock %} diff --git a/templates/qm.html b/templates/qm.html index 007dadb..502c0a3 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %} QM: {{qm|wiki_to_html_short}} {% endblock %} diff --git a/templates/scansfolder.html b/templates/scansfolder.html index 09491b4..a15f054 100644 --- a/templates/scansfolder.html +++ b/templates/scansfolder.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load survex_markup %} {% block title %}Survey Scans Folder{% endblock %} diff --git a/templates/statistics.html b/templates/statistics.html index 790b745..97219ba 100644 --- a/templates/statistics.html +++ b/templates/statistics.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}Expo statistics{% endblock %} diff --git a/templates/subcave.html b/templates/subcave.html index 41fb2d0..28023b1 100644 --- a/templates/subcave.html +++ b/templates/subcave.html @@ -1,5 +1,5 @@ {% extends "cavebase.html" %} -{% load wiki_markup %} + {% load mptt_tags %} {% block title %} Subcave {{subcave}} {% endblock title %} {% block editLink %}<a href={{subcave.get_admin_url}}>Edit subcave {{subcave|wiki_to_html_short}}</a>{% endblock %} diff --git a/templates/svxcaveseveral.html b/templates/svxcaveseveral.html index 27131d5..9e7d7fa 100644 --- a/templates/svxcaveseveral.html +++ b/templates/svxcaveseveral.html @@ -1,19 +1,19 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}List of survex files{% endblock %} {% block content %} + <!-- the only thing passed into this template is a list of object identifiers for caves. + All the processing to extract the survex subdriectories and survex files is done in this template --> {% for cave in caves %} {% autoescape off %} - <h1>Surveys for <a href="/{{cave.url}}">{{cave.official_name}}</a> - kataster:{{cave}}</h1> + <h1>Surveys for <a href="/{{cave.url}}">{{cave.official_name}}</a> - identifier:{{cave}}</h1> {% endautoescape %} - <!-- the only thing passed into this temnplate is the object identifier for a cave. - All the processing to extract the survex subdriectories and survex files is done in this template --> <p>Cave description: <a href="/{{cave.url}}">{{cave.url}}</a> </p> diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html index 3dc318a..ff54c40 100644 --- a/templates/svxcavesingle.html +++ b/templates/svxcavesingle.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}List of survex files{% endblock %} diff --git a/templates/svxcavesingle404.html b/templates/svxcavesingle404.html index 75ef9ac..70dede9 100644 --- a/templates/svxcavesingle404.html +++ b/templates/svxcavesingle404.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}List of survex files{% endblock %} diff --git a/templates/svxfilecavelist.html b/templates/svxfilecavelist.html index f148b07..aae2b00 100644 --- a/templates/svxfilecavelist.html +++ b/templates/svxfilecavelist.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}List of survex files{% endblock %} diff --git a/templates/tasks.html b/templates/tasks.html index e9b12a9..f092493 100644 --- a/templates/tasks.html +++ b/templates/tasks.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load link %} {% block title %}Cambridge Expeditions to Austria{% endblock %} diff --git a/templates/tunnelfiles.html b/templates/tunnelfiles.html index 9c527b9..9995127 100644 --- a/templates/tunnelfiles.html +++ b/templates/tunnelfiles.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load wiki_markup %} + {% load survex_markup %} {% block title %}Tunnel files{% endblock %} |