We have an Overview Presentation on how the cave data, handbook and website are constructed and managed. It contains material which will be merged into this website manual.
Increasing amounts of the site are autogenerated by troggle, and are not static files, +
Increasing amounts of the site are autogenerated by troggle, and are not static files, so you have to edit the base data, not the generated file (e.g cave -pages, QM (queston mark) lists, expo members list, prospecting pages). All +pages, QM (question mark) lists, expo members list, prospecting pages). All autogenerated files say 'This file is autogenerated - do not edit' at the top - so check for that before wasting time on changes that will just be overwritten
++Troggle is a system under development . +
+Troggle is the software collection (not really a "package") based on Django +for keeping track of all expo data in a logical and accessible way, and displaying it on the web. +It also re-formats HTML web pages (such as the Expo Handbook) to create useful links +(such as "Edit this page" in the left hand menu of this page that you are reading - if you are a logged-on user). +
See the Troggle page on the CUCC website - which is not up to date. +
We use a distributed revision control system (DVCS) for all the important data. On expo this means that many people can edit and merge their changes with the expo server in the Tatty Hut even if there is no internet access. Also anyone who is up to date with the Tatty Hut can take their laptop somewhere where there is internet access and update expo.survex.com - which will then get all the updates done by everyone on expo.
@@ -127,6 +137,14 @@ below for details on that.Also note that the website you see is its own Mercurial checkout (just like your local one) so that has to be 'pulled' from the server before your changes are reflected.
+This edits the file served by the webserver (Apache) on +expo.survex.com but it does not update the copy of the file in the +repository in expo.survex.com. To properly finish the job you need to +use putty to ssh into expo.survex.com and run "hg diff" (to check what +changes are pending) and then "hg commit" in the directory +/home/expo/expoweb .
+If you know what you are doing here is the basic info on what's where:
@@ -229,13 +247,7 @@ then restart nautilus nautilus -q. If it works, you'll be able to see t
Simple changes to static files will take effect immediately, but changes to dynamically-generated files (cave descriptions, QM lists etc) will not take effect, until the server runs the expoweb-update script.
-This edits the file served by the webserver (Apache) on -expo.survex.com but it does not update the copy of the file in the -repository in expo.survex.com. To properly finish the job you need to -use putty to ssh into expo.survex.com and run "hg diff" (to check what -changes are pending) and then "hg commit" in the directory -/home/expo/expoweb .
+Photos are stored in the general file area of the site under
http://expo.survex.com/expofiles/photos/
-They are each organised by year, and by photographer (walker).
- -They are much more conveniently viewed at
http://expo.survex.com/photos/
-because the website script creates a much friendlier interface
-
See Photo/GPS/File Upload Instructions -for ordinary expo user instructions on how to do this .
- -See GPS tracks instructions for how to upload tracks recorded on your phone -(or handheld GPS device). These tracks (GPX files) are -stored in the cave data version-controlled part of the site and an entirely difference procedure is required./home/expo/expof directory: /home/expo/expofiles/photos/2018/YourName/-
Obviously replace 'YourName' with your actual name (no spaces!). It is important that you get this right as this specific way of writing your name is standardised across the website. Use the year that the photo was taken or the GPStrack logged.
+Obviously replace 'YourName' with your actual name (no spaces!). +It is important that you get this right as this specific way of writing your name is standardised across the website (this is known as "CamelCase"). +Use the year that the photo was taken or the GPStrack logged.
Note that uploading photos does not automatically update the view at http://expo.survex.com/photos/ immediately. An update script needs to be run. This should run automatically once/day around midnight UTC (2017 and earlier) or a couple of minutes after you do the upload to the right place (2018 if Wookey gets this sorted out in time) but may be broken. Prod a web admin if nothing is updated by the next morning..
@@ -67,6 +69,7 @@ at http://expo.survex.com/photos/ iIf you have been using FTP since the last century or are particularly keen on doing everything using the command-line, read on. +
Works on Windows (using winscp), Linux (using scp), and no doubt