diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2023-11-07 18:37:52 +0200 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2023-11-07 18:37:52 +0200 |
| commit | 3f94955883bae222cb049ef5af0b52c31a3ecac4 (patch) | |
| tree | 9f278a846409defaefeed8045082c30cf94df1e4 /templates/cave.html | |
| parent | 5652b9b66a8889bad24844ac5dd26cc258cd6a5a (diff) | |
| download | troggle-3f94955883bae222cb049ef5af0b52c31a3ecac4.tar.gz troggle-3f94955883bae222cb049ef5af0b52c31a3ecac4.tar.bz2 troggle-3f94955883bae222cb049ef5af0b52c31a3ecac4.zip | |
Fix .3d filename
Diffstat (limited to 'templates/cave.html')
| -rw-r--r-- | templates/cave.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/templates/cave.html b/templates/cave.html index 3e94747..a04bb93 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -5,7 +5,7 @@ <!-- # We put every .3d file in the same folder as # the .svx file, using the {{svx3d}} template variable set in rendercave() in -# core/views/caves.py but with a full path. THIS IS NOW DONE March 2022. +# core/views/caves.py . #--> <link type="text/css" href="/javascript/CaveView/css/caveview.css" rel="stylesheet"/> <script type="text/javascript" src="/javascript/CaveView/js/CaveView2.js" ></script> @@ -18,7 +18,7 @@ const viewer = new CV2.CaveViewer( 'scene', { home: '/javascript/CaveView/', //Wookey old code surveyDirectory: '/expowebcache/3d/', - surveyDirectory: '/cave/3d/', + surveyDirectory: '/cave/3d/', // this is a fake Django url which should return the right place terrainDirectory: '/loser/surface/terrain/' // cannot work, apache not handling this url } ); @@ -27,7 +27,8 @@ const ui = new CV2.CaveViewUI( viewer ); //Wookey old code: ui.loadCave('{{svx3d}}.3d'); - ui.loadCave('{{ cave }}.3d'); + //Wookey new code + ui.loadCave('{{ cave }}.3d'); // ie '1624-161.3d' Troggle used to return a file 161.3d but now returns 1623-161.3d document.getElementById('scene').style.cssText = "background-color: rgb(0, 0, 0); position: relative !important;" } @@ -42,7 +43,7 @@ {% block contentheader %} <table id="cavepage"> <tr> - <th id="kat_no"><!-- why is this not showing unofficial_number??--> + <th id="kat_no"> {{ cave.areacode}} / {% if cave.kataster_number %} {{ cave.kataster_number|safe }} @@ -205,7 +206,7 @@ {% if cave.survex_file %} Primary <a href="/survexfile/{{cave.survex_file}}">survex file</a> for this cave <br> - Download .3d file <a href="{% url "cave3d" cave %}">{% url "cave3d" cave %}</a> + Download .3d file <a href="{% url "cave3d" cave %}">{{cave}}.3d</a><!-- this is a fake directory --> <br> cave survex path '{{ cave.areacode }}/{% if cave.kataster_number %}{{cave.kataster_number}}{% else %}{{cave.unofficial_number}}{% endif %}/' <div id='scene'></div> |