expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-03-27 12:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Very basic user data input updates - removing mercurial

Browse Source
This commit is contained in:
Philip Sargent 2019-07-08 19:48:22 +01:00
parent 8662ea1b29
commit 69e56cb257
4 changed files with 11 additions and 59 deletions

43
handbook/computing/repousage.html

@ -1,43 +0,0 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expedition Handbook: Uploading files/photos</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<p>There are essentially two ways of using expo server: one is just FTP, second using version controll.
<strong>If you can handle version controll use that!</strong>. Currently we're using HG wich is like GIT but a litte retarded.
<h1>Using expo server via version controll software connection</h1>
<h2>Configure on Windows</h2>
<ul>
<li>Get <a href="https://tortoisehg.bitbucket.io/">TortoiseHG</a> application to handle mercurial repo:<br>
<img src="./tutorialimgs/tortoisehg.png" width="300"></li>
<li>Install and open the app. The click 'clone':<br>
<img src="./tutorialimgs/hg_win_clone.png" width ="300">
</li>
<li>Configure as:<br>
<b>source:</b><i>ssh://expo@expo.survex.com/<b>expoweb</b></i>
(you can replace 'expoweb' with one of four repos we have on the server c.f. <a href="http://expo.survex.com/repositories">repositories</a>)<br>
<b>destination:</b> pick location on the local machine<br>
<img src="./tutorialimgs/hg_win_setup.png" width="300">
</li>
<li>Press 'clone'</li>
<li>You should now have a copy of the repo on your machine. Use commands 'commit','pull','push' as in any version controll system. (This page is not meant as version controll tutorial, pls just websearch something)</li>
</ul>
<hr>
<h2>Configure on Linux</h2>
<ul>
<li>Instal mercurial:<br>
<pre>sudo apt-get install mercurial</pre></li>
<li>Clone database:<br>
<pre>hg clone ssh://expo@expo.survex.com/expoweb ~/localdirofyourchoice</pre></li>
<li>You should now have a copy of the repo on your machine. Use commands 'commit','pull','push' as in any version controll system. (This page is not meant as version controll tutorial, pls just websearch something)</li>
</ul>
</body>
</html>

5
handbook/index.htm

@ -51,12 +51,9 @@ This is a scientific expedition - the Austrian government allows us to wander ar
<li>Broken:
<li><a href="essentials.html">Cave locations</a> - How to download locations of known caves.</li>
<li><a href="gpxupload.html">Phone GPS</a> - How to upload location of the cave you've found.</li>
<li><a href="computing/repousage.html">Basic repositories setup</a> - Very brief instructions for Windows and Linux on repository setup.</li>
</i>
</ul>
<li><a href="computing/ftpusage.html">Basic FTP setup</a> - Very brief instructions for Windows, Android and Linux on <strong>how to upload files (and photos)</strong> to expo server.</li>
</i>
<br>
<li><a href="survey/status.html">Trip report status</a> - Missing .svx's, missing tunnel drawings etc.</li>

12
handbook/logbooks.html

@ -26,7 +26,7 @@ into the logbook.html file after expo finished.
and <a href="survey/why.htm">why we make surveys</a> and then the
<a href="survey/index.htm">Survey Handbook</a>
<h3 =id="type">Typing just your trip report</h3>
<h3 =id="type">Typing just your trip report (at the <i>Expo Laptop</i>)</h3>
<p>If you are at basecamp, then it is an excellent idea to type up your logbook trip report.
You can then print this and stick it in the logbook, adding any sketches by hand.
This will save someone (probably you) deciphering your handwriting and typing it up later.
@ -76,15 +76,11 @@ ensure that the updates from all the people entering trip data are OK and don't
<p>Logbooks are typed up and kept in the [expoweb]/years/[nnnn]/ directory as 'logbook.html'.</p>
<h3>Recommended procedure</a></h3>
<h3>Recommended procedure (on another machine)</h3>
<p>
Rather than editing logbook.html when you type up your trip, it is a much better
idea to type up your trip(s) in a separate file, e.g. "logbook-mynewtrip.txt", and store it in the same
place on the <em>expo laptop</em>, i.e.
<pre>
/home/expoweb/years/2018/
</pre>
<p>or email it to a nerd if you are sitting at a different laptop.
idea to type up <i>just your trip(s)</i> in a separate file, e.g. "logbook-mynewtrip.txt", and email it to a nerd if you are sitting at a different laptop.
<h3>Format of the online logbooks</a></h3>

10
handbook/uploading.html

@ -12,9 +12,9 @@
What you are trying to do is to get your happy holiday snaps appear properly indexed with all the others from the previous decades of expo history. You can see them all here: <br /> <a
href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a><br />
which is the end result. But all you have to do is to upload the photos to the right place.
A hidden script does the hard work to make it all look nice.
A hidden script does the hard work to make it all look nice after the upload.
<p>If you are really lazy (or really a beginner) you can use the initial simple method (using /uploads/ )
<p>If you are a beginner you can use the initial simple method below (using /uploads/ )
for the photos you have taken of cave entrances for cave survey and prospecting purposes. But please
rename the filenames of the photos intelligently, e.g. "big-hole-near-path-to-fgh.jpg", or
"2018-ad-07-entrance3.jpg" (rather than "DSC31415926.jpg"), and explain to an admin/nerd what you have done.
@ -26,9 +26,8 @@ Please use lower-case for all filenames.
<ol>
<li>Email a photo or two to someone who knows how to do it. <br>
(If you are doing more than a few photos, email will be clunky, so use another method).
<li>Use the Expo laptop in the tatty hut. Get someone to show you how to do it.
<li>Use the Expo laptop in the tatty hut. Get someone to show you how to use FTP.
</ol>
<p>That's it. There used to be other ways of doing it using browser extensions but these either don't work anymore [since 2017] or the instructions to install them properly have become too complicated.
<p>Beginners should always put all their files into the folder <b>/home/expo/expofiles/uploads/</b> and ask an admin to move them to the right place.
<p>Now go to <a href="#init">using Filezilla initially</a> - still using the Expo laptop.
@ -36,6 +35,9 @@ Please use lower-case for all filenames.
<p>Using your own laptop on expo, or after you return from expo:
<ol>
<li>Download and install <b>Filezilla</b>.
<li>Or learn to use <b><a href="https://www.computerhope.com/unix/scp.htm">scp</a></b>.
<li>Or on a Windows machine try Winscp.
<li>Or if you are using an Android mobile phone, follow <a href="computing/ftpusage.html">Radost's instructions</a> which also cover Winscp briefly.
</ol>
<p>You do need to know the expo password.</p>