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

Better explanation of repos and tricky troggle

Browse Source
This commit is contained in:
Philip Sargent 2020-04-28 12:31:38 +01:00
parent 9ee80df3a1
commit ee81e9a7ba
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
handbook/computing/git-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

15
handbook/computing/repos.html
View File

@ -14,7 +14,7 @@ body {
</style> </style>
<h2 id="tophead">CUCC Expedition: Online repositories</h2> <h2 id="tophead">CUCC Expedition: Online repositories</h2>
<h1>Version-controlled repositories</h1> <h1>Version-controlled repositories</h1>
<a href='/repositories/'><img class="onright" width="300px" src='https://git-scm.com/images/logos/downloads/Git-Logo-1788C.png' alt='git logo'/>
<h3><a id="repositories">The repositories</a></h3> <h3><a id="repositories">The repositories</a></h3>
<p>All the expo data is contained in 4 <var>repositories</var> or <var>repos</var> at <p>All the expo data is contained in 4 <var>repositories</var> or <var>repos</var> at
@ -25,9 +25,18 @@ expo.survex.com:
<li><a href="/repositories/loser/.git/"><var>:loser:</var></a> - the survex cave survey data (not live yet)</li> <li><a href="/repositories/loser/.git/"><var>:loser:</var></a> - the survex cave survey data (not live yet)</li>
<li><a href="/repositories/drawings/.git/"><var>:drawings:</var></a> - the tunnel and therion cave data and drawings (git)</li> <li><a href="/repositories/drawings/.git/"><var>:drawings:</var></a> - the tunnel and therion cave data and drawings (git)</li>
<li><a href="/repositories/expoweb/.git/"><var>:expoweb:</var></a> - the website pages, handbook, generation scripts (git)</li> <li><a href="/repositories/expoweb/.git/"><var>:expoweb:</var></a> - the website pages, handbook, generation scripts (git)</li>
<li><a href="/repositories/troggle/.git/"><var>:troggle:</var></a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li> <li><a href="/repositories/troggle/.git/"><var>:troggle:</var></a> - the database/software part of the survey data management system<br> - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanations </li>
</ul> </ul>
<p>You can read or clone these without any control, but to write ("push") to them you will need to use <varssh://</var> and set up the <a href="keyexchange.html">key exchange</a>.
<h3>Use the online view of these!</a></h3>
<p>These online webpages (links above) give a much clearer view of what is going on than many git tools you may be using on your machine.
<p>Have a look at the <a href="/repositories/drawings/.git/log/">version history of the drawings</a> to look at progress on getting the recent surveys uploaded, and <a href="/repositories/expoweb/.git/stats/?period=y&ofs=10">who has been doing what on the website and handbook</a>.
<p>For an example, see this <a href="/repositories/expoweb/.git/diff/handbook/computing/winlaptop.html?id=615ce571c48075cb606de533c6baa284ac9e964b">simple edit</a>.
<h3>Uploading cave survey data</a></h3>
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <varssh://</var> and set up the <a href="keyexchange.html">key exchange</a>.
<p>So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The <i>expo laptop</i> lives in the potato hut during expo and it is sometimes joined by the laptop '<i>aziraphale</i>'. These are both loaned machines running Linux. If you want to use your own laptop then <p>So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The <i>expo laptop</i> lives in the potato hut during expo and it is sometimes joined by the laptop '<i>aziraphale</i>'. These are both loaned machines running Linux. If you want to use your own laptop then
see the <a href="basiclaptop.html">minimal laptop setup</a>. see the <a href="basiclaptop.html">minimal laptop setup</a>.

BIN
handbook/troggle/tricky-troggle.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

1
handbook/troggle/trogintro.html
View File

@ -8,6 +8,7 @@
<body><style>body { background: #fff url(/images/style/bg-system.png) repeat-x 0 0 }</style> <body><style>body { background: #fff url(/images/style/bg-system.png) repeat-x 0 0 }</style>
<h2 id="tophead">CUCC Expedition Handbook</h2> <h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Troggle - what it is</h1> <h1>Troggle - what it is</h1>
<img class="onright" width="300px" src='tricky-troggle.jpg' alt='git logo'/>
<p>Troggle is the software which runs the the expo cave survey data management and website. <p>Troggle is the software which runs the the expo cave survey data management and website.
<ul> <ul>

4
handbook/troggle/trogmanual.html
View File

@ -24,6 +24,8 @@
</ul> </ul>
<h3 id="troggle">Troggle - why we developed it</a></h3> <h3 id="troggle">Troggle - why we developed it</a></h3>
<a href="https://www.goodreads.com/book/show/1155986.The_Tricky_Troggle">
<img border="1" class="onright" width="150px" src='tricky-troggle.jpg' alt='git logo'/></a>
<p>Troggle.. <p>Troggle..
<ol> <ol>
<li>Coherently publishes expo data by cave, by expedition, by person, by trip or by survey - without requiring duplicate data entry. <li>Coherently publishes expo data by cave, by expedition, by person, by trip or by survey - without requiring duplicate data entry.
@ -41,6 +43,8 @@ for very quick and urgent changes.
[This is the "Edit this page" capability; see <a href="../computing/manual.html#editthispage"> for [This is the "Edit this page" capability; see <a href="../computing/manual.html#editthispage"> for
how to use it</a> and <em>how to tidy up afterwards</em>]. how to use it</a> and <em>how to tidy up afterwards</em>].
</ol> </ol>
<p>* "Troggle eats just one very big meal a year."
<hr /> <hr />
Go on to: <a href="trogarch.html">Troggle architecture</a><br /> Go on to: <a href="trogarch.html">Troggle architecture</a><br />
Return to: <a href="trogintro.html">Troggle intro</a><br /> Return to: <a href="trogintro.html">Troggle intro</a><br />