expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-03-22 10:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing redundant photo uploading instructions

Browse Source
This commit is contained in:
Philip Sargent 2018-07-17 11:11:04 +02:00
parent 54af1fd050
commit 54490fdbd4
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
handbook/update.htm
View File

@ -11,7 +11,7 @@
<p>We have <a href="http://wookware.org/talks/expocomputer/#/">an Overview Presentation</a> on how the cave data, handbook and website are constructed and managed. It contains material which will be merged into this website manual.
<ul>
<li><a href="#photos">Uploading your photos and GPS tracks</a></li>
<li><a href="uploading.html">Uploading your photos and GPS tracks</a></li>
<li><a href="logbooks.html">Uploading typed logbooks</a></li>
<li><a href="#update">Updating the website</a></li>
<li><a href="#manual">Expo Website manual</a></li>
@ -43,13 +43,23 @@ problem. It also means that several people can work on the site on
different computers at once and normally merge their changes
easily.</p>
<p>Increasing amounts of the site are autogenerated by troggle, and are not static files,
<p>Increasing amounts of the site are autogenerated by <a href="#troggle">troggle</a>, 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</p>
<h3 id="troggle">Troggle - what it is</a></h3>
<p>
Troggle is a system under development .
<p>
Troggle is the software collection (not really a "package") based on <a href="https://www.djangoproject.com/">Django</a>
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).
<p>See the <a href="http://www.srcf.ucam.org/caving/wiki/Troggle">Troggle page on the CUCC website</a> - which is not up to date.
<h3 id="mercurial">DVCS - version control</a></h3>
<p>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.
</p>
@ -127,6 +137,14 @@ below for details on that.</p>
<p>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.</p>
<h3><a id="editthispage">Using 'Edit This Page'</a></h3>
<p>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 .</p>
<h3><a id="quickstart">Quick start</a></h3>
<p>If you know what you are doing here is the basic info on what's where:<br>
@ -229,13 +247,7 @@ then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see t
<p>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.</p>
<h3><a id="editthispage">Using 'Edit This Page'</a></h3>
<p>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 .</p>
<h3><a id="Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>
@ -347,25 +359,6 @@ http://expo.survex.com/expo/surveys/surveytable.html http://expo.survex.com/surv
<li>Other people's work - the noinfo hierarchy.</li>
<li>Style guide for writing cave descriptions: correct use of boldface (<em>once</em> for each passage name, at the primary definition thereof; other uses of the name should be links to this, and certainly should not be bold.) </li>
</ul>
<h3><a id="photos">Uploading photos and GPS tracks</a></h3>
<p>Photos are stored in the general file area of the site under <br /><a
href="http://expo.survex.com/expofiles/photos/">http://expo.survex.com/expofiles/photos/</a></p>
<p>
They are each organised by year, and by photographer (walker). </p>
<p>They are much more conveniently viewed at <br /> <a
href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a><br />
because the website script creates a much friendlier interface
</p>
The directory names are like this: "2014/YourName/" (i.e no spaces, CamelCase for names).
<p>See <a href="uploading.html">Photo/GPS/File Upload Instructions</a>
for ordinary expo user instructions on how to do this .</p>
See <a href="gpxupload.html">GPS tracks instructions</a> 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.
<hr />

5
handbook/uploading.html
View File

@ -59,7 +59,9 @@ To make the admin's life easier, create your own folder in <pre>/home/expo/expof
directory: /home/expo/expofiles/<b>photos</b>/2018/YourName/
</pre>
<p>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.</p>
<p>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.</p>
<p>Note that uploading photos does not automatically update the view
at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> 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..</p>
@ -67,6 +69,7 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
<h2>Experts only</h2>
<p>If you have been using FTP since the last century or are particularly keen on doing everything using the command-line, read on.
<h3>Using scp</h3>
<p>Works on Windows (using winscp), Linux (using scp), and no doubt