expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-08 14:54:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Completing fomratting for for <!DOCTYPE html> to make sure ann <br> and <hr> are now conformant

Browse Source
This commit is contained in:
Philip Sargent
2020-03-05 23:23:41 +00:00
parent 73f1693ffb
commit 112dd3c713
49 changed files with 384 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
handbook/bierbook.html
View File

@@ -28,7 +28,7 @@ This is used to record vital information:
<p>
<a href="i/bierentries.jpg"><img src="t/tbierentries.jpg" alt="Beer record" hspace=10px border=1 align="right" /></a>The record of the number of beers (and other drinks) that each person drinks from the common store in the potato hut looks like this. This is used when the treasurer does the final accounts reckoning after the end of expo.
<br>
<br />
<h3>Nights camping</h3>
<p><a href="i/nights.jpg"><img src="t/tnights.jpg" alt="Nights record" hspace=10px border=1 align="right" /></a>

2
handbook/computing/menudesign.html
View File

@@ -272,7 +272,7 @@ which we encourage all expoers to download to their phone before they leave base
We already have a number of these but some are in .odt format which is not phone-friendly. But that is another job to fix.
<hr>
<hr />
</body>
</html>

2
handbook/festering/brewery.html
View File

@@ -144,7 +144,7 @@ Braumeister, together with
Frau Schneeweis and our tour guide for the sponsorship and
an excellent day out.</p>
<hr>
<hr />
<ul id="links">
<li>Back to <a href="../fester.htm">festering page</a></li>
</ul>

6
handbook/geartape2018.html
View File

@@ -125,7 +125,7 @@ Red</span> toughtags
</td></tr>
</table>
<br>
<br />
<table border="1" cellspacing="0" cellpadding="5" align="center">
<tr>
@@ -374,7 +374,7 @@ Red</span>
</td></tr>
</table>
<br>
<br />
<table border="1" cellspacing="0" cellpadding="5" align="center">
<tr>
@@ -452,7 +452,7 @@ earth is thin</td>
<td>2018
</td></tr>
</table>
<br>
<br />
<h3>Gear-tape - labelling</h3>
<p>It is almost essential (for caving generally, but particularly for Expo) to settle
on a particular combination of colours of electrical insulation tape, and label

16
handbook/index.htm
View File

@@ -22,7 +22,7 @@ You've never been to expo? This is what you need to know before packing to come:
<li><a href="geartape.html">Kit labelling</a> - Gear-tape colours in use.</li>
<li><a href="essentials.html">GPS safety</a> - Get GPS tracks of safe paths on your phone before you leave home.</li>
</ul>
<hr>
<hr />
<h2>Second steps</h2>
This is what it's all about:
@@ -39,7 +39,7 @@ Need to get in touch with someone? Look here.
<li><a href="rescue.htm">RESCUE</a> - How and when to call rescue. (read before you need!)</li>
<li><a href="cavelink.html">Cavelink</a> - The VLF radio system that enables communication between topcamp and underground.</li>
</ul>
<hr>
<hr />
<h2>Computing and Cave Surveying</h2>
This is a scientific expedition - the Austrian government allows us to wander around the plateau <em>in exchange for</em> cave surveys. Learn how to contribute!
@@ -57,10 +57,10 @@ This is a scientific expedition - the Austrian government allows us to wander ar
<li><a href="computing/yourlaptop.html">Configuring everything on a new laptop</a> - It's a lot. This is not the place to start</li>
<br>
<br />
<li><a href="survey/status.html">Trip report status</a> - Missing .svx's, missing tunnel drawings etc.</li>
</ul>
<hr>
<hr />
<h2>Topcamp info</h2>
Things that are likely to be relevant at topcamp.
@@ -73,7 +73,7 @@ Things that are likely to be relevant at topcamp.
<li><a href="charging.html">Drill battery charging</a> - How to charge drill batts. (important! you could break them)</li>
<li><a href="solar.html">Solar Panels</a> - Set-up and put-away info.</li>
</ul>
<hr>
<hr />
<h2>Plateau walking and caving info</h2>
Things that are likely to be relevant on the plateau, looking for caves and surveying them.
@@ -101,7 +101,7 @@ Things that are likely to be relevant at basecamp.
<li><a href="rope_history.html">Rope history</a> - Rope usage and retirement policy.</li>
<li><a href="bankofexpo.html">Bank of expo</a> - How to use the Bank of Expo.</li>
</ul>
<hr>
<hr />
<h2>Planning to next Expo</h2>
<ul>
@@ -109,7 +109,7 @@ Things that are likely to be relevant at basecamp.
<li><a href="leader.htm">Expo leader checklist</a> - For leaders: check these before you leave UK.</li>
<li><a href="treasurer.html">Expo treasurer's guide</a> - For treasurers: tasks, tips, accounting policies.</li>
</ul>
<hr>
<hr />
<h2>History</h2>
<ul>
@@ -117,7 +117,7 @@ Things that are likely to be relevant at basecamp.
<li><a href="bcamps.html">Base camps</a> - History of basecamps</li>
<li><a href="tcamps.html">Top camps</a> - History of topcamps</li>
</ul>
<hr>
<hr />
<h2>Misc</h2>
<ul>

2
handbook/logbooks.html
View File

@@ -93,7 +93,7 @@ with the Gnome 3.2 desktop manager, so click on "Activities" in the top left cor
This will bring down a vertical menu of icons down the left hand side of the screen. Hovering
over the icons brings up a label, and the one you want is at (or near) the bottom with the label "Text editor". Click on it.
<p>If you are lucky this will bring up an empty window for a new file.
<br>If you are unlucky it will bring up the previous person's file.
<br />If you are unlucky it will bring up the previous person's file.
<p>If it is a new file, save it to the Downloads folder (/home/expo/Downloads) using the "File->Save" menu
item and give it a sensible name such as "logbook-mynewtrip.txt".
<p>If it was someone else's file, save it using the "File->Save" menu. Then close the text editor ("File->Close").

4
handbook/manual.html
View File

@@ -131,7 +131,7 @@ You will have done the
<a href="computing/keyexchange.html">key-pair setup</a> process - which you can only do entirely on your own if
you have access to the <i>expo laptop</i>.
<p>See <a href="computing/basiclaptop.html">setting up a minimal laptop</a> for a short list of software. This assumes you know how to use it all.
<br>See <a href="computing/yourlaptop.html">setting up your own laptop</a> for the full list of software we use and where to get it.
<br />See <a href="computing/yourlaptop.html">setting up your own laptop</a> for the full list of software we use and where to get it.
<p>Note that the instructions are primarily for people using Linux with some help for those using Windows. If you are a Mac user then you are on your own.
@@ -167,7 +167,7 @@ caves which are generated from the cave survey data, can not be edited in this w
for some types of these like 'caves'.</p>
<h3>Cheat lists and quick reminders</h3>
<p>If you know what you are doing here is the basic info on what's where:<br>
<p>If you know what you are doing here is the basic info on what's where:<br />
(if you don't know what you're doing, skip to <a href="#editingthedata management system">Editing the data management system</a> below.)
<ul>
<li>Quick <a href="computing/qstart-git.html">reminders for using git</a> at the command line.

4
handbook/survey/getin.htm
View File

@@ -154,7 +154,7 @@ dataset:</p>
<li>Don't put any *equate directives to other surveys into your file (or any
survey legs which quote station names from other survey files). Instead, go to
the file which *includes the other files in the same area. <br><br>
the file which *includes the other files in the same area. <br /><br />
For example, if you
have created a file trivial.svx in the caves-1623/204/deepsouth directory, go to the
file deepsouth/deepsouth.svx, where you will find *include lines for each of
@@ -163,7 +163,7 @@ include for your file, and *equate lines for each of your survey stations which
is the same as one in another survey. If your survey connects to points in
surveys in files in more than one directory then the *equates should go in the
/204/204.svx file, but at this stage it is probably worth enlisting the help of
someone who knows the structure of the data inside-out! <br><br>
someone who knows the structure of the data inside-out! <br /><br />
<li>You should now find that if you run survex on one of the master files
(all.svx, 204.svx, smk-system.svx, etc.) which includes the area of
your new survey, it is linked in and will show up when you use the resultant

6
handbook/survey/newcave.html
View File

@@ -44,10 +44,10 @@ the instructions section by section which tell you how to
actually do these things.
<ul>
<li>Write up your trip in the <a href="../logbooks.html">logbook</a> including rigging sketches<br><br>
<li>Write up your trip in the <a href="../logbooks.html">logbook</a> including rigging sketches<br /><br />
<li>Put notes in a new wallet
<li>Scan the notes (see <a href="newwallet.html#onlinew">"new wallet"</a> for the filenames to use and <a href="newwallet.html#scan">how to use the scanner</a>)
<li>Type in survey data (in the right place in the file system) in <a href="#survexformat">survex format</a>.<br>
<li>Type in survey data (in the right place in the file system) in <a href="#survexformat">survex format</a>.<br />
(This includes passage descriptions and open leads known as QMs: Question Marks).
<li>Run survex to create a centre-line printout
<li>Transcribe your sketches onto centre-line paper
@@ -59,7 +59,7 @@ actually do these things.
<li>Create a new folder in the file system for the wallet data
<li>Create a new folder in the file system for the survex data
<li>Create a "new cave entry" for the guidebook description
<li>Write the <b>full cave description</b> into the correct html files. <br>
<li>Write the <b>full cave description</b> into the correct html files. <br />
(This will mean copying the passage descriptions from the survex files.)
<li>Update the index tick boxes on paper: as your wallet progresses through this process
<li>Update the online record of those tick boxes

6
handbook/survey/newwallet.html
View File

@@ -39,7 +39,7 @@ e.g. <b>2018#22</b>, already printed on the label.
<li>Write the date and the names of the people on the trip on the label.
<li>Tick whether your trip was a surface or a cave trip.
<li>Write the name of the cave (with number if you know it), e.g. "264 Balkon"
<li>Write the area in the cave you did your surveying, e.g. "mongol rally"<br>
<li>Write the area in the cave you did your surveying, e.g. "mongol rally"<br />
<li>Now turn to the index sheets at the front of the folder,
and fill in the line (e.g. 2018#22) for your wallet
<ul>
@@ -50,7 +50,7 @@ and fill in the line (e.g. 2018#22) for your wallet
</ul>
<p align=center>
<a href="2017-wallet-coverlist.jpg" border=1><img src="2017-wallet-coverlist.jpg" width=50%></a>
<br>
<br />
<em>Image of wallet index sheet - click for larger image</em>
</p>
<li>Now, if you have not done it immediately after you left the cave,
@@ -94,7 +94,7 @@ of what information is in the wallet and where the corresponding survey data is
icon from the vertical menu of icons which you get by clicking on
"Activities" in the top lefthand corner of the screen.
<p style="margin-left:20px">[ Normal people should skip this, <br>&nbsp;
<p style="margin-left:20px">[ Normal people should skip this, <br />&nbsp;
but nerds need to look here
for the <a href="onlinewallet.html">online wallet maintenance process</a> ].

12
handbook/survey/status.html
View File

@@ -13,17 +13,17 @@
<p>There are two separate online systems to help you do this.
<p><b>First</b>, you look online at or for the current year: (2018 in this example)<br>
<p><b>First</b>, you look online at or for the current year: (2018 in this example)<br />
<a href="http://expo.survex.com/expofiles/surveyscans/2018/index.html"><b>/expofiles/surveyscans/2018/</b></a>
<br>
<br />
(you can substitute any year after 2015 instead of 2018 in that example).
<p> or if you are chasing work unfinished from previous years look at the consolidated list 2014-2018:<br>
<p> or if you are chasing work unfinished from previous years look at the consolidated list 2014-2018:<br />
<a href="http://expo.survex.com/expofiles/surveyscans/2014-18/index.html"><b>/expofiles/surveyscans/2014-18/</b></a>
<br>
<br />
<p><b>Second</b>, look at the online troggle-generated table of logbook entries and survey trips<br>
<p><b>Second</b>, look at the online troggle-generated table of logbook entries and survey trips<br />
<a href="http://expo.survex.com/expedition/2018"><b>/expedition/2018/</b></a>
<br>
<br />
(You need to scroll down past the table of attendees). This expedition report only shows those cave surveys which have been both typed up and entered into the online system, and also only those logbook entries which have been typed up already. So it will not be as up to date as the first method.
<p>The most up to date method is to look in the lever-arch file containing the plastic survey wallets which is kept in the potato hut during expo.

2
handbook/travelcosts.html
View File

@@ -180,7 +180,7 @@ An 'options' page in the Bier Book may be used to let people sign up for a car a
Please get in touch with the treasurer if you think this applies to you and it
will be dealt with on a case-by-case basis.
<hr>
<hr />
<H2>Travel expenses - How it used to be done (pre-2001)</H2>

2
handbook/treasurer.html
View File

@@ -340,7 +340,7 @@ Email: jc@johnmcooper.freeserve.co.uk</P>
<P ALIGN="CENTER">
<HR>
<SMALL>Started 1999-12-31 by Earl Merson, Treasurer 1998 &amp; 1999.<br>
<SMALL>Started 1999-12-31 by Earl Merson, Treasurer 1998 &amp; 1999.<br />
This page was last modified 2000-01-07</SMALL></P>
-->
<hr />

8
handbook/website-history.html
View File

@@ -162,7 +162,7 @@ tunneldata has also been migrated to git, and renamed 'drawings' as it includes
The loser repo and expoweb repo need more care in migration. Loser should have the old 1999-2004 CVS history restored, and maybe toms annual snapshots from before that, so ancient history can usefully be researched (sometimes useful). It's also a good idea to add the 2015, 2016 and 2017 ARGE data we got (in 2017) added in the correct years so that it's possible to go back to an 'end of this year' checkout and get an accurate view of what was found (for making plots and length stats). All of that requires some history rewriting, which is best done at the time of conversion.
<p>
Similarly expoweb is full of bloat from fat images and surveys and one 82MB thesis that got checked in and then removed. Clearing that out is a good idea. I have a set of 'unused fat blob' lists which can be stripped out with git-gilter. It's not hard to make a 'do the conversion' script, ready for sometime after expo 2019 has calmed down.
<hr>
<hr />
<h3 id="automation">Automation on expo.survex.com</h3>
<p>Ths section is entirely out of date (June 2014), and moved here for historic interest</p>.
@@ -203,9 +203,9 @@ Before then we manually maintained <a href="../update.htm">a list of updates</a>
<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>
Return to<br>
<a href="onlinesystems.html">Website update</a><br>
Return to<br />
<a href="onlinesystems.html">Website update</a><br />
<hr>
<hr />
</body>
</html>