diff --git a/.gitignore b/.gitignore index 2e94370..c3ec8d4 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,77 @@ debian/localsettings.py debian/credentials.py wsl/localsettings.py wsl/credentials.py +media/jslib/leaflet/leaflet.css +media/jslib/leaflet/leaflet.css.br +media/jslib/leaflet/leaflet.css.gz +media/jslib/leaflet/leaflet.css.map +media/jslib/leaflet/leaflet.esm.js +media/jslib/leaflet/leaflet.js +media/jslib/leaflet/leaflet.markercluster-src.js +media/jslib/leaflet/leaflet.markercluster.js +media/jslib/leaflet/leaflet.min.js +media/jslib/leaflet/leaflet.min.js.br +media/jslib/leaflet/leaflet.min.js.gz +media/jslib/leaflet/leaflet.min.js.map +media/jslib/leaflet/MarkerCluster.css +media/jslib/leaflet/MarkerCluster.Default.css +media/jslib/leaflet/images/layers-2x.png +media/jslib/leaflet/images/layers.png +media/jslib/leaflet/images/marker-icon-2x.png +media/jslib/leaflet/images/marker-icon.png +media/jslib/leaflet/images/marker-shadow.png +media/jslib/openlayers/OpenLayers.js +media/jslib/openlayers/OpenLayers.light.js +media/jslib/openlayers/OpenLayers.light.min.js +media/jslib/openlayers/OpenLayers.lite.js +media/jslib/openlayers/OpenLayers.lite.min.js +media/jslib/openlayers/OpenLayers.min.js +media/jslib/openlayers/OpenLayers.mobile.js +media/jslib/openlayers/OpenLayers.mobile.min.js +media/jslib/openlayers/OpenLayers.tests.js +media/jslib/openlayers/OpenLayers.tests.min.js +media/jslib/openlayers/Lang/ar.js +media/jslib/openlayers/Lang/be-tarask.js +media/jslib/openlayers/Lang/bg.js +media/jslib/openlayers/Lang/br.js +media/jslib/openlayers/Lang/ca.js +media/jslib/openlayers/Lang/cs-CZ.js +media/jslib/openlayers/Lang/da-DK.js +media/jslib/openlayers/Lang/de.js +media/jslib/openlayers/Lang/el.js +media/jslib/openlayers/Lang/en-CA.js +media/jslib/openlayers/Lang/en.js +media/jslib/openlayers/Lang/es.js +media/jslib/openlayers/Lang/fi.js +media/jslib/openlayers/Lang/fr.js +media/jslib/openlayers/Lang/fur.js +media/jslib/openlayers/Lang/gl.js +media/jslib/openlayers/Lang/gsw.js +media/jslib/openlayers/Lang/hr.js +media/jslib/openlayers/Lang/hsb.js +media/jslib/openlayers/Lang/hu.js +media/jslib/openlayers/Lang/ia.js +media/jslib/openlayers/Lang/id.js +media/jslib/openlayers/Lang/io.js +media/jslib/openlayers/Lang/is.js +media/jslib/openlayers/Lang/it.js +media/jslib/openlayers/Lang/ja.js +media/jslib/openlayers/Lang/km.js +media/jslib/openlayers/Lang/ksh.js +media/jslib/openlayers/Lang/lt.js +media/jslib/openlayers/Lang/nb.js +media/jslib/openlayers/Lang/nds.js +media/jslib/openlayers/Lang/nl.js +media/jslib/openlayers/Lang/nn.js +media/jslib/openlayers/Lang/oc.js +media/jslib/openlayers/Lang/pl.js +media/jslib/openlayers/Lang/pt-BR.js +media/jslib/openlayers/Lang/pt.js +media/jslib/openlayers/Lang/ro.js +media/jslib/openlayers/Lang/ru.js +media/jslib/openlayers/Lang/sk.js +media/jslib/openlayers/Lang/sv-SE.js +media/jslib/openlayers/Lang/te.js +media/jslib/openlayers/Lang/vi.js +media/jslib/openlayers/Lang/zh-CN.js +media/jslib/openlayers/Lang/zh-TW.js diff --git a/README.txt b/README.txt index 721ba12..6725139 100644 --- a/README.txt +++ b/README.txt @@ -59,52 +59,6 @@ Conventionally on our main master expo server we install everything that we can [venv description removed - read it in http://expo.survex.com/handbook/troggle/troglaptop.html ] - -Testing the django installation -------------------------------- - - -So now rename one of the relevant platform files, e.g. if you are on WSL on Windows: -$ mv localsettingsWSl.py localsettings.py - - -otherwise, if you are on debian: -$ cp _deploy/debian/localsettings.py . - -The git repo copies have got munged passwords. -localsettings.py is not stored in git, but does have the correct passwords. -So use sFTP to download localsettings.py from expo.survex.com - -WARNING: only the WSL and debian variants are current in May 2021. All the others are so old that -they will need serious work to be useable. Copy what you need from WSL and debian variants of -localsettings.py - - - -Now you need to edit the following settings in your localsettings.py file to match your -development machine: - -FILES = Path('/mnt/f/expofiles/') -EXPOFILES = Path('/mnt/f/expofiles/') - -All the other settings (drawings, expoweb etc.) will work fine if they are parallel directories -to the directory you installed troggle into. The troggle code can find out itself where it -is living. - -If you do not have a local copy of /expofiles/ (40 GB), you can use the expo server copy if -you set: -EXPOFILESREMOTE = TRUE -and then the FILES and EXPOFILES setings will be ignored. - -You will probably want to change the various EMAIL settings too. - - - - - -If yo have run the test suite several times you will need to undo several commits (and delete the files producd by the test suite). - - CSS and media files ------------------- Temporarily we are not using the STATICFILES capability but are instead