From e22146c53c9c4e7e345cde68217a75fb43682a55 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 11 Aug 2018 15:31:17 +0200 Subject: [PATCH] Fixing filezilla stuff after feedback fom nat --- handbook/fzconfig.html | 11 ++++++++++- handbook/uploading.html | 20 +++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/handbook/fzconfig.html b/handbook/fzconfig.html index ab0bd0000..9f0aafdcc 100644 --- a/handbook/fzconfig.html +++ b/handbook/fzconfig.html @@ -15,7 +15,16 @@
  • Open Filezilla and start it running.
  • Click on the "File" menu item, and select the "Import..." command, this will open a file browser on your local machine
  • Navigate to your default downloads folder and select the zilla-uploads.xml file. -
  • Now select the "Bookmarks" menu item: at the bottom of the drop-down menu you will see "Expo-uploads". Click on it. +
  • Now select the "Bookmarks" menu item: +
  • You will now be prompted for the password for the expo server. This is the "cavey:beery" one which we never write down or write in emails. Get it verbally or by phone or secure text message from another expoer.
  • Now you are in and can copy and move files anywhere. But please don't: stick to copying files from your machine (the left window) to the server (the right window):

    diff --git a/handbook/uploading.html b/handbook/uploading.html index a9bcf269b..8546b81b1 100644 --- a/handbook/uploading.html +++ b/handbook/uploading.html @@ -11,9 +11,14 @@

    The end-result you are trying to achieve

    What you are trying to do is to get your happy holiday snaps appear properly indexed with all the others from the previous decades of expo history. You can see them all here:
    http://expo.survex.com/photos/
    -which is the end result. But all you have to do is to upload the photos to the right place. A hidden script does the hard work to make it all look nice. +which is the end result. But all you have to do is to upload the photos to the right place. +A hidden script does the hard work to make it all look nice. -

    If you are really lazy (or really a beginner) you can use the initial simple method for the photos you have taken of cave entrances [for cave survey and prospecting purposes] so long as you label the filenames of the photos very carefully and tell an admin/nerd what you have done. +

    If you are really lazy (or really a beginner) you can use the initial simple method (using /uploads/ ) +for the photos you have taken of cave entrances for cave survey and prospecting purposes. But please +rename the filenames of the photos intelligently, e.g. "big-hole-near-path-to-fgh.jpg", or +"2018-ad-07-entrance3.jpg" (rather than "DSC31415926.jpg"), and explain to an admin/nerd what you have done. +Please use lower-case for all filenames.

    If you are looking for how to upload a GPS track, those instructions have been moved to here.

    Simple instructions

    @@ -84,13 +89,22 @@ mac and android with other tools. If you have Windows 10 and http://winscp.net/eng/docs/screenshots

    + -

    Both scp and cadaver give you an 'explorer-like' interface (although winscp can +

    scp gives you an 'explorer-like' interface (although winscp can give you a norton-commander-style 2-pane UI as well).

    + +

    Using WebDAV

    +This no longer works as we had to change the folder permissions for /uploads/. Sorry. +

    Using rsync

    No, don't use rsync for this. Really don't. It's too liable to delete everything or to overwrite files which are not changed at all because of the incompatibilities between Linux and Windows filename conventions (uppercase and lowercase are automagically converted and rsync gets it wrong).