expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-29 14:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add links to the caveentry page.

Browse Source
This commit is contained in:
Wookey 2017-12-25 23:06:50 +00:00
parent d309a27220
commit 7eed4d2be3
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
handbook/index.htm
View File

@ -1,4 +1,3 @@
<html>
<head>
<title>CUCC Expedition Handbook</title>
@ -50,7 +49,7 @@ This is <a href="../survey.html">Survey data</a>.Therion protractors in <a href=
<h2>Computing stuff</h2>
<dl>
<dt><a href="update.htm">Website and Data</a></dt>
<dd>This tells you how the website and cave data are arranged, accessed and used.</dd>
<dd>This tells you how the website and cave data are arranged, accessed and used, including entering new cave data.</dd>
<dt><a href="uploading.html">Uploading files to 'expofiles'</a></dt>
<dd>How to upload photos/reports/surveys/documents/scans to the
filestore section of the website. For larger files that are too fat to

23
handbook/update.htm
View File

@ -7,7 +7,7 @@
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Expo Website</h1>
<p>The website is now large and complicated with a lot of (too many!) moving parts. This handbook section contains info at various levels: simple 'Howto add stuff' information for the typical expoer, more detailed info for cloning it onto your own machine for more significant edits, and structural info on how it's all put together for people who want/need to change things. [This page is now so big that it needs to be split up.]</p>
<p>The website is now large and complicated with a lot of aspects. This handbook section contains info at various levels: simple 'How to add stuff' information for the typical expoer, more detailed info for cloning it onto your own machine for more significant edits, and structural info on how it's all put together for people who want/need to change things. [This page is now so big that it needs to be split up.]</p>
<ul>
<li><a href="#photos">Uploading your photos and GPS tracks</a></li>
@ -16,7 +16,7 @@
<li><a href="expodata.html">Expo website developer info</a></li>
</ul>
<h2><a id="update">Updating the website - HOWTO</a></h2>
<h2><a id="update">Updating the website - overview</a></h2>
<p>Simple <a href="checkin.htm">instructions</a> for updating the website
(on the expo machine).</p>
@ -32,11 +32,11 @@ button, but that means you either need to be on expo with the expo
computer, or be able to check out a local copy. If neither of these
apply then using the 'edit this page' button is fine.</p>
<p>It's important to understand that everything on the site (except
<p>It's important to understand that everything on the site (except things under
'expofiles') is stored in a distributed version control system (DVCS)
(called '<a href=#mercurial>Mercurial</a>' and accessed by most people
using software called 'TortoiseHg'), which means that every edited
file needs to be 'checked in' at some point. The Expo website manual
file needs to be 'checked in' after editing. The Expo website manual
goes into more detail about this, below. This stops us losing data and
makes it very hard for you to screw anything up permanently, so don't
worry about making changes - they can always be reverted if there is a
@ -44,16 +44,17 @@ 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, not just files,
so you have to edit the base data, not the generated file. All
<p>Increasing amounts of the site are autogenerated, not static files,
so you have to edit the base data, not the generated file (e.g cave
pages, QM 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>
<h2>Expo website manual</h2>
<p>Editing the expo website is an adventure. Until now, there was no
guide which explains the whole thing as a functioning system. Learning
<p>Editing the expo website is an adventure. Until 2007, there was no
guide which explained the whole thing as a functioning system. Learning
it by trial and error is non-trivial. There are lots of things we
could improve about the system, and anyone with some computer nous is
very welcome to muck in. It is slowly getting better organised.</p>
@ -158,7 +159,7 @@ the files from the server to local expofiles directory:</p>
<p><tt>rsync -av /home/expo/expofiles expo@expo.survex.com:</tt></p>
<p>(do be careful not to delete piles of stuff then rsync back - as it'll all get deleted on the server too, and we may not have backups!). Use rsync --dry-run --delete-after -a to check what would be deleted. If you are using rsync from a Windows machine you will <em>not</em> get all the files as some filenames are incompatible with Windows: see more detail under <a href="Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a> below.</p>
<p>(do be <b>incredibly</b> careful not to delete piles of stuff then rsync back, or to get the directory level of the command wrong - as it'll all get deleted on the server too, and we may not have backups!). It's <b>absolutely vital</b>Use rsync --dry-run --delete-after -a first to check what would be deleted. If you are using rsync from a Windows machine you will <em>not</em> get all the files as some filenames are incompatible with Windows: see more detail under <a href="Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a> below.</p>
<p>(We have an issue with rsync not using the appropriate user:group attributes for files pushed back to the server. This may not cause any problems, but watch out for it.)</p>
@ -205,7 +206,7 @@ then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see t
<p><tt>hg merge</tt></p>
<p>before pushing again</p>
<p>(and sort out any conflicts if you've both edited the same file) before pushing again</p>
<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>
@ -248,6 +249,8 @@ files are processed by troggle. Use <tt>python databaseReset.py
caves</tt> in /expofiles/troggle/ to update the site/database after
editing these files.</p>
<p>Clicking on 'New cave' (at the bottom of the cave index) lets you enter a new cave. <a href="caveentry.html">Info on how to enter new caves has been split into its own page</a>.</p>
<p>(If you remember something about CAVETAB2.CSV for editing caves, that was
superseded in 2012).</p>