mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 15:21:55 +00:00
trying to recover from merge failure due to permissions problem
This commit is contained in:
parent
397c1a6626
commit
e54850ad65
@ -3,118 +3,118 @@
|
|||||||
<title>Expo Systems Exptl. To-Do List</title>
|
<title>Expo Systems Exptl. To-Do List</title>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<link rel="stylesheet" type="text/css" href="x-todo-styles.css">
|
<link rel="stylesheet" type="text/css" href="x-todo-styles.css">
|
||||||
<h1>Expo Systems Exptl. To-Do List</h1>
|
<h1>Expo Systems Exptl. To-Do List</h1>
|
||||||
<button onclick="window.location.href = 'x-todo.html_edit';">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 sub-items</label>
|
<label for="toggle-1">Toggle sub-items</label>
|
||||||
<input type="checkbox" id="toggle-1">
|
<input type="checkbox" id="toggle-1">
|
||||||
<h2>Documentation</h2>
|
<h2>Documentation</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->Wallets & new-cave
|
<li><!--2020-03-26 psargent-->Wallets & new-cave
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->Explain (in the wallets process) how to view the surveys
|
<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,
|
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
|
and <br>(2) so that you can check that you have done it properly when you
|
||||||
have finished.</li>
|
have finished.</li>
|
||||||
<li><!--2020-03-26 psargent-->Explain how to link a new cave into the other caves in
|
<li><!--2020-03-26 psargent-->Explain how to link a new cave into the other caves in
|
||||||
troggle filesystem</li>
|
troggle filesystem</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><!--2020-03-26 psargent-->Troggle architecture
|
<li><!--2020-03-26 psargent-->Troggle architecture
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->Handbook: explain how troggle works - much better and simpler. Fix
|
<li><!--2020-03-26 psargent-->Handbook: explain how troggle works - much better and simpler. Fix
|
||||||
mistakes I wrote. For future system maintainers</li>
|
mistakes I wrote. For future system maintainers</li>
|
||||||
<li><!--2020-03-26 psargent-->Copy the .wiki material into the documentation somewhere</li>
|
<li><!--2020-03-26 psargent-->Copy the .wiki material into the documentation somewhere</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><!--2020-03-26 psargent-->Surveyscans
|
<li><!--2020-03-26 psargent-->Surveyscans
|
||||||
<ul>
|
<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>
|
<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>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2>Photos</h2>
|
<h2>Photos</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->Capitalisation in filenames problem
|
<li><!--2020-03-26 psargent-->Capitalisation in filenames problem
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->run the duplicate filename script on the server in
|
<li><!--2020-03-26 psargent-->run the duplicate filename script on the server in
|
||||||
/photos/xml/ as there are files which differ only in
|
/photos/xml/ as there are files which differ only in
|
||||||
capitalisation of their names.</li>
|
capitalisation of their names.</li>
|
||||||
<li><!--2020-03-26 psargent-->Fix such duplicates in the /photos/ folders where this
|
<li><!--2020-03-26 psargent-->Fix such duplicates in the /photos/ folders where this
|
||||||
problem originates</li>
|
problem originates</li>
|
||||||
<li><!--2020-03-26 psargent-->Document this issue of duplicate photo filenames produced by
|
<li><!--2020-03-26 psargent-->Document this issue of duplicate photo filenames produced by
|
||||||
multiple cameras running similar software</li>
|
multiple cameras running similar software</li>
|
||||||
<li><!--2020-03-26 psargent-->somehow fix the photo filenames which use capital letters on
|
<li><!--2020-03-26 psargent-->somehow fix the photo filenames which use capital letters on
|
||||||
import or upload, or by a cron job</li>
|
import or upload, or by a cron job</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2>Surveys data entry</h2>
|
<h2>Surveys data entry</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->2019 surveyscans
|
<li><!--2020-03-26 psargent-->2019 surveyscans
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->edit all the content.json</li>
|
<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-->try to autocomplete the content.json by parsing .svx files</li>
|
||||||
<li><!--2020-03-26 psargent-->Put personal names into canonical form</li>
|
<li><!--2020-03-26 psargent-->Put personal names into canonical form</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2>Troggle</h2>
|
<h2>Troggle</h2>
|
||||||
<h2>Expo Server</h2>
|
<h2>Expo Server</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent--> www-data:www-data permissions
|
<li><!--2020-03-26 psargent--> www-data:www-data permissions
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->Fix permissions so that all files served by troggle have
|
<li><!--2020-03-26 psargent-->Fix permissions so that all files served by troggle have
|
||||||
www-data:www-data ownership and group ownership, otherwise the
|
www-data:www-data ownership and group ownership, otherwise the
|
||||||
"Edit this page" fails with a permissions error, or
|
"Edit this page" fails with a permissions error, or
|
||||||
</li>
|
</li>
|
||||||
<li><!--2020-03-26 psargent-->Or fix group
|
<li><!--2020-03-26 psargent-->Or fix group
|
||||||
membership for the process running django so that it can write
|
membership for the process running django so that it can write
|
||||||
files owned by 'expo'
|
files owned by 'expo'
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2>
|
<h2>
|
||||||
<font color="darkviolet">This to-do-list gadget itself</font>
|
<font color="darkviolet">This to-do-list gadget itself</font>
|
||||||
</h2>
|
</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->Eventual aim
|
<li><!--2020-03-26 psargent-->Eventual aim
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->to replace GitHub <a href="https://github.com/CaveSurveying/CUCCexposurveyissues/issues">
|
<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>
|
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
|
<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
|
||||||
<br>2.for survey data progress/issues (though troggle itself can be used for some of this if cleaned up a bit)
|
<br>2.for survey data progress/issues (though troggle itself can be used for some of this if cleaned up a bit)
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li><!--2020-03-26 psargent-->Try to automate simple functions in javascript
|
<li><!--2020-03-26 psargent-->Try to automate simple functions in javascript
|
||||||
<ul>
|
<ul>
|
||||||
<li><!--2020-03-26 psargent-->to control this document
|
<li><!--2020-03-26 psargent-->to control this document
|
||||||
in-place (tick, delete) instead of using the <a
|
in-place (tick, delete) instead of using the <a
|
||||||
href="https://www.tiny.cloud/docs/general-configuration-guide/use-tinymce-inline/">
|
href="https://www.tiny.cloud/docs/general-configuration-guide/use-tinymce-inline/">
|
||||||
tinymce</a> HTML editor in Django</li>
|
tinymce</a> HTML editor in Django</li>
|
||||||
<li><!--2020-03-26 psargent-->Maybe restructure whole page as JSON and use
|
<li><!--2020-03-26 psargent-->Maybe restructure whole page as JSON and use
|
||||||
javascript editor to create (edit), re-order and demote items. So long
|
javascript editor to create (edit), re-order and demote items. So long
|
||||||
as the content is inserted into the DOM, it should work ?</li>
|
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-->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
|
<li><!--2020-03-26 psargent-->Use javascript to skip over the _edit page and submit changes
|
||||||
direct to server when updating</li>
|
direct to server when updating</li>
|
||||||
<li><!--2020-03-26 psargent-->checkboxes so that items can be ticked
|
<li><!--2020-03-26 psargent-->checkboxes so that items can be ticked
|
||||||
(which also does strike-through)</li>
|
(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-->
|
<li><!--2020-03-26 psargent-->bin icon to delete an item? Better to have an archive process.</li><!--2020-03-26-->
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
<hr>
|
<hr>
|
||||||
<!--2020-03-26--> Testing area..
|
<!--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>
|
<script>
|
||||||
document.getElementById("demo").innerHTML = "Demonstation innerHTML change CONFIRMED";
|
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
|
<!--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. -->
|
the original file from disc. So storing changes done by js will mean working directly with the POST action and a form. -->
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
Reference in New Issue
Block a user