expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-15 18:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Major update from server

Browse Source
This commit is contained in:
expo
2016-06-09 04:22:13 +01:00
parent b1595e5cd5 6259e438ee
commit b146859281
1043 changed files with 5416 additions and 4228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
handbook/index.htm
View File

@@ -28,6 +28,10 @@
<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>
<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
be in the website repository (generaly anything bigger than 200KB).</dd>
<dt><a href="tortoise/tortoise-win.htm">Aled's Windows 101</a></dt>
<dd>A brief, straightforward guide (with pictures!) covering how to get Putty and TortoiseHg working on a Windows PC.
<dt><a href="computer.html">Expo Computer</a></dt>

28
handbook/update.htm
View File

@@ -56,10 +56,10 @@
<p>Use these credentials for access to the site. The user is 'expo',
with a cavey:beery password. Ask someone if this isn't enough clue for you.
<b>This password is important for security</b>. The whole site <strong>will</strong get hacked by spammers or worse if you are not careful with it. Use a secure method for passing it on to others that need to know (i.e not unencrypted email), don't publish it anywhere, don't check it in to the website by accident. A lot of people use it and changing it is a pain for everyone so do take a bit of care.
<b>This password is important for security</b>. The whole site <strong>will</strong> get hacked by spammers or worse if you are not careful with it. Use a secure method for passing it on to others that need to know (i.e not unencrypted email), don't publish it anywhere, don't check it in to the website by accident. A lot of people use it and changing it is a pain for everyone so do take a bit of care.
</p>
<p>Note that you don't need a password to view most things, but you will need ne to change them</p>
<p>Note that you don't need a password to view most things, but you will need one to change them</p>
<h3><a id="repositories">The repositories</a></h3>
@@ -117,21 +117,21 @@ stored just as files (not in version control). See below for details on that.</p
<p>Photos, scans (logbooks, drawn-up cave segments) (This is about
16GB of stuff which you probably don't actually need locally) To sync
the files from the server to local expoimages directory:</p>
the files from the server to local expofiles directory:</p>
<p><tt>rsync -av expo@expo.survex.com:expoimages /home/expo/fromserver</tt></p>
<p><tt>rsync -av expo@expo.survex.com:expofiles /home/expo</tt></p>
<p>To sync the local expoimage directory back to the server:</p>
<p><tt>rsync -av /home/expo/fromserver/expoimages expo@expo.survex.com:</tt></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!)</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.</p>
<h3><a id="editingthewebsite">Editing the website</a></h3>
<p>To edit the website fully, you need a mercurial client. Some (static text) pages can be edited directly on-line using the 'edit this page link' which you'll see if you are logged into troggle. DYnamically-generated pages can not be edited in this way.</p>
<p>To edit the website fully, you need a mercurial client. Some (static text) pages can be edited directly on-line using the 'edit this page link' which you'll see if you are logged into troggle. In general dynamically-generated pages can not be edited in this way, but forms are provided for some page-types like 'caves'.</p>
<p>Mercurial can be used from the command line, but if you prefer a GUI, tourtoisehg is highly recommended on all OSes (available on Linux from Debian 6 and Ubuntu 11.04 onwards).</p>
<p>Mercurial can be used from the command line, but if you prefer a GUI, tourtoisehg is highly recommended on all OSes.</p>
<p>Linux: Install mercurial and tortoisehg-nautilus from synaptic,
then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see the menus of Tortoise within your Nautilus windows. </p>
@@ -164,10 +164,12 @@ then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see t
<p><tt>hg push</tt></p>
<p>If someone else is editing the same bit at the same time you may also need to:</p>
<p>Before pushing, you should do an <tt>hg pull</tt> to sync with upstream first. If someone else has edited the same files you may also need to do:</p>
<p><tt>hg merge</tt></p>
<p>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>
<h3><a id="mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>
@@ -196,7 +198,7 @@ then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see t
cave files in noinfo/cave_data/ and noinfo/entrance_data/. These files
are named <area>-<cavenumber>.html (where area is 1623 or 1626). These
files are processed by troggle. Use <tt>python databaseReset.py
cavesnew</tt> in /expofiles/troggle/ to update the site/database after
caves</tt> in /expofiles/troggle/ to update the site/database after
editing these files.</p>
<p>(If you remember something about CAVETAB2.CSV for editing caves, that was
@@ -244,7 +246,7 @@ T/U: Jess 1 hr, Emma 0.5 hr
<h3><a id="photos">Uploading photos</a></h3>
<p>Photos are stored in the general file area of the site under <a
href="http://expo.survex.com/expoimages/photos/">http://expo.survex.com/expoimages/photos/</a>
href="http://expo.survex.com/expofiles/photos/">http://expo.survex.com/expofiles/photos/</a>
They are organised by year, and by photographer. Please use directory
names like 2014/YourName (i.e no spaces, CamelCase for names).</p>
@@ -253,8 +255,8 @@ href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a></p>
<p>Photos can be uploaded in 2 basic ways:
<ol>
<li>Rsync,scp,sftp as user 'expo' to expo.survex.com, into the directory expoimages/photos/&lt;year&gt;/&lt;PhotographerName&gt;</li>
<li>Webdav upload to special dir http://expo.survex.com/expoimages/uploads/&lt;year&gt;/&lt;PhotographerName&gt;</li>
<li>Rsync,scp,sftp as user 'expo' to expo.survex.com, into the directory expofiles/photos/&lt;year&gt;/&lt;PhotographerName&gt;</li>
<li>Webdav upload to special dir http://expo.survex.com/expofiles/uploads/&lt;year&gt;/&lt;PhotographerName&gt;</li>
</ol></p>
<p>See <a href="uploading.html">Photo/File Upload Instructions</a> for

27
handbook/uploading.html
View File

@@ -9,25 +9,27 @@
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading photos and files</h1>
<p>The expo website supports 2 basic methods of upload:
<p>The expo website has a big section under 'expofiles' that is not part of the repositories. This section describes how to move files into that area. It supports 2 basic methods of upload:
<ol>
<li>Uploading directly to the file store using scp/sftp/rsync</li>
<li>Uploading to a special 'uploads' directory using Webdav</li>
</ol>
</p>
<p>In both cases you need to know the expo password.</p>
<p>In the former case nothing else needs doing. In the second case an
admin has to move the files to the correct final location, so rememebr
admin has to move the files to the correct final location, so remember
to tell someone you've done it.</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>. An
update script needs to be run. This should run once/day around
midnight UTC, but may be broken. Prod a web admin.</p>
midnight UTC, but may be broken. Prod a web admin if nothing is
updated by the next morning..</p>
<h2>Installing FireFTP</h2>
<p>Works on Windows, Mac, Linux, Android.</p>
<p>Works on Windows, Mac, Linux, Android. This is a firefox browser plugin that enables FTP/SFTP uploads using just your browser.</p>
<ol>
<li>Install the firefox web browser. You can download it and find
@@ -55,19 +57,20 @@ on the centre of the screen.</li>
<h2>Using scp</h2>
<p>Works on Windows (using winscp), Linux (using scp), and no doubt mac and android with other tools.</p>
<p>Works on Windows (using winscp), Linux (using scp), and no doubt
mac and android with other tools.</p>
<p>The above FireFTP is just one example of a tool that does this job</p>
<pre>
directory: /home/expo/expoimages/photos/2013/YourName
directory: /home/expo/expofiles/photos/2015/YourName
server: expo.survex.com
user: expo
with the usual expo password
protocol: sftp or scp
</pre>
<p>Obviously replace 'YourName' with your actual name (no spaces)</p>
<p>Obviously replace 'YourName' with your actual name (no spaces!)</p>
<p>If you don't have winscp installed you can get it from here:
http://winscp.net/eng/index.php</p>
@@ -80,18 +83,18 @@ http://winscp.net/eng/docs/screenshots</p>
<h2>Using Webdav</h2>
<p>This method can only upload under one special 'uploads'
directory. Ask someone tomove your uploaded files to the final
location.</p>
<p>This method can only upload to one special 'uploads'
directory. Ask someone to move your uploaded files to the final
location. But you may not need any extra software.</p>
<p> This is the upload dir: <tt><a href="/expoimages/uploads/">http://expo.survex.com/expoimages/uploads/</a></tt>
<p> This is the upload dir: <tt><a href="/expofiles/uploads/">http://expo.survex.com/expofiles/uploads/</a></tt>
<p>You can use 'open as webfolder' on IE, or install this:
https://addons.mozilla.org/en-US/firefox/addon/open-as-webfolder/ on
firefox, you will get a pop-up box asking for authenticaion for
'expo-uploads'. The user is 'expo', the password is the usual
one. Once done you can just copy files in.</p>
<p>Make a directory like photos/2013/YourName so we know what's
<p>Make a directory like photos/2015/YourName so we know what's
been uploaded.
<p>Command-line people can use the 'cadaver' client which is even