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

Merge from server

Browse Source
This commit is contained in:
Wookey 2020-03-30 03:52:40 +01:00
commit 4daec791d6
6 changed files with 226 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TODO
View File

@ -1,14 +1,2 @@
Add missing images to logbooks from
2000, 2008, 2009, 2011
fix corrupted image in 2001 log
2011 logbook:
type up via-ferrate & bolt-testing writeups (In paper book, not in scan or HTML)
200 logbook:
Type up "list of GPS locations still to type"
2019
transcribe the rest of those blog entries into expoweb/years/2019/logbook.html
copy the photos from the UKCaving blog into expofiles/photos/2019/<MyName>/ -- in fact many of those photos are already there
edit in the links to those photos in the right place in 2019/logbook.html
everything here moved to handbook/computing/x-todo.html
Philip Sargent 2020/03/28

0
folk/to-do/benvanmillingen-Jan1982.jpg → folk/i/benvanmillingen-Jan1982.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

24
folk/l/benvm.htm
View File

@ -1,13 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expo member: Ben van Millingen</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Ben van Millingen</h1>
<body>
<p><img class="onleft" src="../i/benvm.jpg" width="132" height="135"
alt="" />
<img class="onright" width="180" src="../i/benvanmillingen-Jan1982.jpg" />
<b>Ben van Millingen</b>,
Queens' 1976-79 (Tacklemaster 1978-79).<br />
Expedition 1978, 1979, 1980, 1983.<br />
@ -16,10 +25,15 @@ Explored <a href="../../1623/107.htm">Gemseh&ouml;hle</a> (1623/107) in
and worked in the <a href="../../1623/41.htm">Stellerwegsystem</a>
(1623/41) and <a href="../../1623/87.htm">1623/87</a> in 1980.
<a href="../../1623/145/145.html">Wolfh&ouml;hle</a> (1623/145) was the main
venue in 1983.<br />
Photo taken in Hall of the Greene King in Eislufth&ouml;hle.</p>
venue in 1983.
<p>
Photo (right) taken in Greenclose, New Year meet Jan. 1982.</p>
<p>
Photo (left) taken in Hall of the Greene King in Eislufth&ouml;hle.</p>
<hr style="clear: both" /><p class="caption">Photo &copy; Andy Waddington, 1979</p>
<hr style="clear: both" /><p class="caption">Photo (left) &copy; Andy Waddington, 1979</p>
<!-- Photo S485, Photo-CD 6121 1651 2353 img 84 -->
<hr />
<!-- LINKS -->

26
handbook/computing/x-todo-styles.css
View File

@ -55,30 +55,36 @@ h2, h3, h4 {
margin-bottom: 0;
}
ul:not(#links) li ul, ul:not(#links) ul {
dd {
font: 18px Calibri, sanserif;
font-weight: normal;
list-style-type: disc;
color: 6083BF;
#list-style-type: disc;
line-height: 1.3;
}
dd:before {
content: "- ";
}
/* Default State */
ul:not(#links) {
dt {
font: 20px Calibri, sanserif;
font-weight: bold;
color: 6083BF;
margin-top: 0.4em;
margin-left: -1.2em;
#margin-left: -1.2em;
margin-left: 0;
margin-right: 5em;
list-style-type: none;
line-height: 1.4;
#list-style-type: none;
line-height: 1.4;
}
/* Toggled State */
input[type=checkbox] ~ ul:not(#links) li ul {
display: none;
}
input[type=checkbox]:checked ~ ul:not(#links) li ul {
input[type=checkbox] ~ dl dd {
display: block;
}
input[type=checkbox]:checked ~ dl dd {
display: none;
}

258
handbook/computing/x-todo.html
View File

@ -1,120 +1,206 @@
<!DOCTYPE html>
<html>
<head>
<title>Expo Systems Exptl. To-Do List</title>
<meta charset="utf-8">
</head>
<body>
<link rel="stylesheet" type="text/css" href="x-todo-styles.css">
<h1>Expo Systems Exptl. To-Do List</h1>
<button onclick="window.location.href = 'x-todo.html_edit';">Update this to-do list</button>
<label for="toggle-1">Toggle sub-items</label>
<link rel="stylesheet" type="text/css" href="x-todo-styles.css" />
<button onclick="window.location.href = 'x-todo.html';">Update this to-do list</button>
<!--
<button onclick="window.location.href = 'x-todo.html_edit';">Update this to-do list</button>
-->
<!--
<label for="toggle-1">Toggle visibility of all sub-items</label>
<input type="checkbox" id="toggle-1">
-->
<h2>Experimental</h2>
<p>Click on a sub-heading to hide and reveal the individual to-do items. If a heading is in italics, then there are hidden items.
<p>Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before. But this is not working yet. Please do not try as that will currently delete all the Javascript that makes the hide/reveal functions work.
<h2>Taken from file on ::expoweb::/TODO </h2>
<dl>
<dt>Add missing images to logbooks</dt>
<dd>
2000, 2008, 2009, 2011</dd>
<dd>
fix corrupted image in 2001 log</dd>
<dt>2011 logbook:</dt>
<dd>type up via-ferrate & bolt-testing writeups (In paper book, not in scan or HTML)</dd>
<dt>200? logbook:</dt>
<dd>
Type up "list of GPS locations still to type"</dd>
<dt>2019 Logbook</dt>
<dd>
transcribe the rest of those blog entries into expoweb/years/2019/logbook.html</dd>
<dd>
copy the photos from the UKCaving blog into expofiles/photos/2019/<MyName>/ -- in fact many of those photos are already there</dd>
<dd>edit in the links to those photos in the right place in 2019/logbook.html</dd>
</dl>
<h2>Documentation</h2>
<ul>
<li><!--2020-03-26 psargent-->Wallets & new-cave
<ul>
<li><!--2020-03-26 psargent-->Explain (in the wallets process) how to view the surveys
online so that <br>(1) you can see an example of how to do your new one,
and <br>(2) so that you can check that you have done it properly when you
have finished.</li>
<li><!--2020-03-26 psargent-->Explain how to link a new cave into the other caves in
troggle filesystem</li>
</ul>
</li>
<li><!--2020-03-26 psargent-->Troggle architecture
<ul>
<li><!--2020-03-26 psargent-->Handbook: explain how troggle works - much better and simpler. Fix
mistakes I wrote. For future system maintainers</li>
<li><!--2020-03-26 psargent-->Copy the .wiki material into the documentation somewhere</li>
</ul>
</li>
<li><!--2020-03-26 psargent-->Surveyscans
<ul>
<li><!--2020-03-26 psargent-->explain where the image files are referenced from: svx, tunnel/therion, and why there are so many broken links</li>
</ul>
</li>
</ul>
<dl>
<dt><!--2020-03-29 psargent-->Document this to-do list thing</dt>
<dd><!--2020-03-29 psargent-->explain how clicking works</dd>
<dt><!--2020-03-26 psargent-->Wallets and new-cave</dt>
<dd><!--2020-03-26 psargent-->Explain (in the wallets process) how to view the surveys
online so that <br>&nbsp;&nbsp;(1) you can see an example of how to do your new one,
and <br>&nbsp;&nbsp;(2) so that you can check that you have done it properly when you
have finished.</dd>
<dd><!--2020-03-26 psargent-->Explain how to link a new cave into the other caves in
troggle filesystem</dd>
<dt><!--2020-03-26 psargent-->Troggle architecture</dt>
<dd><!--2020-03-26 psargent-->Handbook: explain how troggle works - much better and simpler. Fix
mistakes I wrote. For future system maintainers</dd>
<dd><!--2020-03-26 psargent-->Copy the .wiki material into the documentation somewhere</dd>
<dt><!--2020-03-26 psargent-->Surveyscans</dt>
<dd><!--2020-03-26 psargent-->explain where the image files are referenced from: svx, tunnel/therion, and </dd>
<dd>why there are so many broken links</dd>
</dl>
<h2>Photos</h2>
<ul>
<li><!--2020-03-26 psargent-->Capitalisation in filenames problem
<ul>
<li><!--2020-03-26 psargent-->run the duplicate filename script on the server in
<dl>
<dt><!--2020-03-26 psargent-->Capitalisation in filenames problem
<dd><!--2020-03-26 psargent-->run the duplicate filename script on the server in
/photos/xml/ as there are files which differ only in
capitalisation of their names.</li>
<li><!--2020-03-26 psargent-->Fix such duplicates in the /photos/ folders where this
problem originates</li>
<li><!--2020-03-26 psargent-->Document this issue of duplicate photo filenames produced by
multiple cameras running similar software</li>
<li><!--2020-03-26 psargent-->somehow fix the photo filenames which use capital letters on
import or upload, or by a cron job</li>
</ul>
</li>
</ul>
capitalisation of their names.</dd>
<dd><!--2020-03-26 psargent-->Fix such duplicates in the /photos/ folders where this
problem originates</dd>
<dd><!--2020-03-26 psargent-->Document this issue of duplicate photo filenames produced by
multiple cameras running similar software</dd>
<dd><!--2020-03-26 psargent-->somehow fix the photo filenames which use capital letters on
import or upload, or by a cron job</dd>
</dl>
<h2>Surveys data entry</h2>
<ul>
<li><!--2020-03-26 psargent-->2019 surveyscans
<ul>
<li><!--2020-03-26 psargent-->edit all the content.json</li>
<li><!--2020-03-26 psargent-->try to autocomplete the content.json by parsing .svx files</li>
<li><!--2020-03-26 psargent-->Put personal names into canonical form</li>
</ul>
</li>
</ul>
<dl>
<dt><!--2020-03-26 psargent-->2019 surveyscans
<dd><!--2020-03-26 psargent-->edit all the content.json</dd>
<dd><!--2020-03-26 psargent-->try to autocomplete the content.json by parsing .svx files</dd>
<dd><!--2020-03-26 psargent-->Put personal names into canonical form</dd>
</dl>
<h2>Troggle</h2>
<h2>Expo Server</h2>
<ul>
<li><!--2020-03-26 psargent--> www-data:www-data permissions
<ul>
<li><!--2020-03-26 psargent-->Fix permissions so that all files served by troggle have
<dl>
<dt><!--2020-03-26 psargent--> www-data:www-data permissions
<dd><!--2020-03-26 psargent-->Fix permissions so that all files served by troggle have
www-data:www-data ownership and group ownership, otherwise the
"Edit this page" fails with a permissions error, or
</li>
<li><!--2020-03-26 psargent-->Or fix group
</dd>
<dd><!--2020-03-26 psargent-->Or fix group
membership for the process running django so that it can write
files owned by 'expo'
</li>
</ul>
</li>
</ul>
</dd>
</dd>
</dl>
<h2>
<font color="darkviolet">This to-do-list gadget itself</font>
</h2>
<ul>
<li><!--2020-03-26 psargent-->Eventual aim
<ul>
<li><!--2020-03-26 psargent-->to replace GitHub <a href="https://github.com/CaveSurveying/CUCCexposurveyissues/issues">
CUCCexposurveyissues</a> for non-tunnel, non-GIS issues.</li>
<li><!--2020-03-26 psargent-->We need two of these: <br>1.for expo systems work (troggle & scripts) - the current priority as we have nowhere currently that Wookey is willing to use
<dl>
<dt><!--2020-03-26 psargent-->Eventual aim
<dd><!--2020-03-26 psargent-->to replace GitHub <a href="https://github.com/CaveSurveying/CUCCexposurveyissues/issues">
CUCCexposurveyissues</a> for non-tunnel, non-GIS issues.</dd>
<dd><!--2020-03-26 psargent-->We need two of these: <br>1.for expo systems work (troggle & scripts) - the current priority as we have nowhere currently that Wookey is willing to use
<br>2.for survey data progress/issues (though troggle itself can be used for some of this if cleaned up a bit)
</ul>
</li>
</dd>
<li><!--2020-03-26 psargent-->Try to automate simple functions in javascript
<ul>
<li><!--2020-03-26 psargent-->to control this document
<dt><!--2020-03-26 psargent-->Try to automate simple functions in javascript
<dd><!--2020-03-26 psargent-->to control this document
in-place (tick, delete) instead of using the <a
href="https://www.tiny.cloud/docs/general-configuration-guide/use-tinymce-inline/">
tinymce</a> HTML editor in Django</li>
<li><!--2020-03-26 psargent-->Maybe restructure whole page as JSON and use
tinymce</a> HTML editor in Django</dd>
<dd><!--2020-03-26 psargent-->Maybe restructure whole page as JSON and use
javascript editor to create (edit), re-order and demote items. So long
as the content is inserted into the DOM, it should work ?</li>
<li><!--2020-03-26 psargent-->Implement comments on an issue, mimicking GitHub issues wiki</li>
<li><!--2020-03-26 psargent-->Use javascript to skip over the _edit page and submit changes
direct to server when updating</li>
<li><!--2020-03-26 psargent-->checkboxes so that items can be ticked
(which also does strike-through)</li>
<li><!--2020-03-26 psargent-->bin icon to delete an item? Better to have an archive process.</li><!--2020-03-26-->
</ul>
</li>
as the content is inserted into the DOM, it should work ?</dd>
<dd><!--2020-03-26 psargent-->Implement comments on an issue, mimicking GitHub issues wiki</dd>
<dd><!--2020-03-26 psargent-->Use javascript to skip over the _edit page and submit changes
direct to server when updating</dd>
<dd><!--2020-03-26 psargent-->checkboxes so that items can be ticked
(which also does strike-through)</dd>
<dd><!--2020-03-26 psargent-->bin icon to delete an item? Better to have an archive process.</dd><!--2020-03-26-->
</ul>
</dl>
<hr>
<!-- ------------------- Do not touch anything below here ------------------------>
<!--2020-03-26--> Testing area..
<div id="demo">Demonstation as initially read from disc</div>
<div id="demo">Demonstation as initially read from disc</div>
<script>
document.getElementById("demo").innerHTML = "Demonstation innerHTML change CONFIRMED";
</script>
</script>
<!--Bother. The DOM is not carried across to the _edit page. It looks like the _edit page just re-reads
the original file from disc. So storing changes done by js will mean working directly with the POST action and a form. -->
</body>
<script>
// TO DO - make the <dt> italic when any of the <dd> following it are hidden.
var itemlist = document.getElementsByTagName('dd');
for (i = 0; i < itemlist.length; i++) {
itemlist[i].onclick = hideable;
}
var itemlist = document.getElementsByTagName('dt');
for (i = 0; i < itemlist.length; i++) {
itemlist[i].onclick = showable;
}
function showable () {
// When clicking on a <dt> item, show or not all the following <dd> elements
if (this.style.fontStyle !== "italic") {
this.style.fontStyle = "italic";
} else {
this.style.fontStyle = "normal";
}
var ddO = this.nextElementSibling;
while((ddO !== null) && (ddO.nodeName.toLowerCase() == 'dd')){
if (this.style.fontStyle === "italic") {
ddO.style.display = 'none';
} else {
ddO.style.display = 'block';
}
ddO = ddO.nextElementSibling;
}
}
function hideable () {
var x = this;
if (x.style.display === "none") {
x.style.display = "block";
} else {
x.style.display = "none";
}
}
</script>
<hr /></body>
</html>

18
scripts/make-folklist.py
View File

@ -16,6 +16,8 @@ output = ""
lines = sys.stdin.readlines()
headcounts_byyear = [0]*(len(lines[0].split(","))-5)
for r in lines[1:]:
r = r.replace("\n","")
r = r.replace("\r", "")
@ -31,7 +33,21 @@ for r in lines[1:]:
if mug: pics +=1
output += '<tr><td>'
if expos_caving == 0: output += '<span class="didntcave">'
output += name.replace('""', '"')
# Middle names still not working: MorvenBeranek-Stanley , Sarah Livia Zerbes
# Need to manage names e.g. <span lang=""sv"">Leif Hornsved (Nickname)</span> => LeifHornsved
namevis = name.replace('""', '"').strip('"')
# Need to manage e.g.Olaf K&auml;hler
# Need to manage e.g. Bal%26aacute%3BzsIzapy
nameurl = namevis.replace(' ', '')
nameurl = nameurl.replace('&', '%26')
nameurl = nameurl.replace(';', '%3B')
nameurl = re.sub('<[^>]*>','',nameurl)
nameurl = re.sub('\([^\)]*\)','',nameurl) # mostly noit needed, but is for Wookey
namelink= "<a href='/person/" + nameurl + "'>" + namevis + "</a>"
output += namelink
#output += name.replace('""', '"')
if expos_caving == 0: output += '</span>'
output += '</td><td>'
if guest: output += '&sect;'