Commit Graph

2420 Commits

Author SHA1 Message Date
Martin Green
e4fe5eaf5d removed extranius bracket from html 2023-06-08 01:10:07 +01:00
Martin Green
c7494fe379 bug fix 2023-06-07 23:49:19 +01:00
Martin Green
e4112431be bug fix 2023-06-07 23:47:14 +01:00
Martin Green
65eec8e91d attempt to use {% url %} tag to point at 3d file for cave viewer 2023-06-07 23:44:44 +01:00
Martin Green
0b0f2f07e1 Try having caveviewer using same url as download link again 2023-06-07 23:25:25 +01:00
Martin Green
ee34f87563 Replaced cave viewer link to 3d file with the working orginal 2023-06-07 23:20:51 +01:00
Martin Green
e42f0569fd Made the sources of the 3d download files consistent 2023-06-07 23:19:08 +01:00
Martin Green
d242a8bb1d Try using url template command to link to 3d files 2023-06-07 23:08:28 +01:00
Martin Green
0cd32d6a15 See what breaks when put .3d on the end of urls for dowloading 3d files 2023-06-07 22:58:28 +01:00
Martin Green
fc9977952e Changed source of cave 3d files back. 2023-06-07 22:47:06 +01:00
Martin Green
56e9273047 changed source of 3d files for cave viewer, to see if it works better 2023-06-07 22:45:36 +01:00
Martin Green
12cee59605 Try not showing kataster codes if they are empty/None 2023-06-07 22:38:22 +01:00
Martin Green
90862e9a89 Add editlink classes for editing the entrances 2023-06-07 22:26:11 +01:00
Martin Green
ec3ebe8499 Fixed comments again 2023-06-07 22:21:41 +01:00
Martin Green
1ef636ca6f fixed broken commment tags 2023-06-07 22:19:12 +01:00
Martin Green
174d7bfe13 Commented out Kataster status. Chnaged Survey heading to Surveys and Rigging Guides. Moved explorers and references down the page. 2023-06-07 22:08:11 +01:00
Martin Green
4e34ae0530 Reordered cave description and survey. 2023-06-07 21:54:25 +01:00
Expo on server
f477507d27 Ignore Windows Zone.identifier files
Ignore all of media/jslib except the readme
2023-06-04 11:17:48 +01:00
969ed6cce5 added 1627 caves to 'caves'page 2023-05-20 22:47:09 +03:00
2e6b8d44f1 adding BS4 because of Martin's KML stuff 2023-05-20 21:47:14 +03:00
93201ab458 better layout to understand apache interactions 2023-05-20 21:36:05 +03:00
Martin Green
43724f1cf6 When reloading a cave, do so from cave.filename, rather than inorrectly assuming the cave is named after its slug 2023-05-08 23:09:15 +01:00
Martin Green
7d140af87a Do not rename caves when saving 2023-05-08 22:34:45 +01:00
Martin Green
77ed1b444c Hack to turn cave URL to absolute links, so they can work from anywhere on the website. 2023-05-08 22:32:49 +01:00
Martin Green
f7fca58c57 Start of creating kmz file, with entrance photos and links to expo.survex.com 2023-05-08 01:10:43 +01:00
Martin Green
ea7c29a54e Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-05-02 22:41:36 +01:00
Martin Green
0052385333 Add lat long to entrance locations on cave pages 2023-05-02 22:40:44 +01:00
7f0e7d8fa3 Ubuntu 22.04 + python3.11 2023-05-02 23:26:53 +03:00
Philip Sargent (laptop)
ef467ad481 Making the dummy entrance thing clear 2023-05-02 17:42:58 +03:00
Philip Sargent (laptop)
175307773b More fixes for laptop 2023-05-02 15:28:28 +03:00
Philip Sargent (laptop)
8e982bd6be Fixing new dev machine setup 2023-05-02 14:27:55 +03:00
Martin Green
783154d24a Restored check of git status after a committ, but only for the one file being committed 2023-05-01 22:06:48 +01:00
Philip Sargent (laptop)
40126f6e2f fixing laptop SNowWHite 2023-05-01 23:29:20 +03:00
Martin Green
1ccd9c418b template missing from last commit 2023-05-01 00:03:58 +01:00
Martin Green
896af43994 kml file output for google earth etc 2023-05-01 00:01:41 +01:00
Martin Green
2ee63a9804 If a cave is made with no entrances, redirect to a new entrance form for the cave 2023-04-30 21:42:03 +01:00
Martin Green
c7b3e8aff0 Added an ordering of entrances 2023-04-30 21:41:17 +01:00
Martin Green
c50236575f Dummy entrances were being written to a global variable, recording that they have a filename. But the filename was not written. This was then causing an exception when the user asked to edit a cave, leading to all entrances being reread. Obviously the dummy entrances file ould not be read.
PS. Do we really want to reread all entrances when we start editing a cave?
2023-04-30 21:06:57 +01:00
Martin Green
e8d1265ee4 Be more specific about what is being commited and do not check for unadded changes, and then through an error at the user, which they are unlikely to understand. 2023-04-30 21:04:05 +01:00
Martin Green
10ff8a5aab Fixed errors when creating new caves and entrances via the website. Moved slug logic to forms (previously checked in). This allows slug uniqueness to be validated in the form 2023-04-30 19:05:57 +01:00
Martin Green
941100a8a3 Previously if a cave was found without an entrance an entrance was added to the database. However as this was not also added as a file, the new entrance could not be edited via the web interface. Without an entrance being made, they can still be added. 2023-04-30 19:03:09 +01:00
Martin Green
374caa0d9a Fixeed spelling error in variable name 2023-04-30 19:01:07 +01:00
Martin Green
82aaa2b523 Improved cave form, layout text and validations 2023-04-30 19:00:22 +01:00
Martin Green
31a60ce85c For a cave, force users to enter are and have a unique URL. Cope better if area not defined 2023-04-30 18:58:41 +01:00
Martin Green
0a3a6934c4 Added some commented out lines for allowing for local development, where files are server from /usr/share/javascript or expofilescache 2023-04-30 18:54:53 +01:00
Martin Green
ed9f7b03bf Have entrance coordinates displayed to web pages. (Requires expo web entrance survey points to start with 1623 or 1626) 2023-04-30 00:59:58 +01:00
Expo on server
fc8584775e Get CaveView working again on cave pages. (v2.2.0)
Move caveView section back to bottom of page.
2023-04-29 23:35:18 +01:00
Martin Green
b7ec4f2efe python virtual library 2023-04-29 22:49:26 +01:00
Martin Green
0b566575f3 Change uploaded images to jpg to png, for much smaller files 2023-04-29 22:49:26 +01:00
Expo on server
73af227fb3 remove unused copy of CaveView in troggle and updated cave.html
template for caveview2
2023-04-29 22:46:14 +01:00