From e27791c1d7e9b9a1a644607bcac59040cea83610 Mon Sep 17 00:00:00 2001 From: Wookey Date: Sat, 20 Sep 2014 07:45:36 +0100 Subject: [PATCH] Add new 'uploading' page on how to install/use FireFTP/Winscp/Webdav. Reer to it in main computer handbook page. --- handbook/update.htm | 16 ++++++ handbook/uploading.html | 105 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 handbook/uploading.html diff --git a/handbook/update.htm b/handbook/update.htm index 50a3193f0..7a76bded6 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -45,6 +45,7 @@
  • Updating cave pages
  • Updating expo year pages
  • Adding typed logbooks
    • +
  • Uploading photos
  • Ticking off QMs
  • Maintaining the survey status table
  • History
    • @@ -224,6 +225,21 @@ T/U: Jess 1 hr, Emma 0.5 hr
    +

    Uploading photos

    + +Photos are stored in the general file area of the site under http://expo.survex.com/expoimages/photos/ They are organised by year, and by photographer. Please use directory names like 2014/JuliaDay (i.e no spaces, CamelCase for names). + +They are viewed at http://expo.survex.com/photos/ + +Photos can be uploaded in various ways: + + +See Photo/File Upload Instructions for using webdav/webfolders or winscp from your browser or with other tools, on various OSes. +

    Ticking off QMs

    To be written.

    diff --git a/handbook/uploading.html b/handbook/uploading.html new file mode 100644 index 000000000..2a236d58d --- /dev/null +++ b/handbook/uploading.html @@ -0,0 +1,105 @@ + + + + +CUCC Expedition Handbook: Uploading files/photos + + + +

    CUCC Expedition Handbook

    +

    Uploading photos and files

    + +

    The expo website supports 2 basic methods of upload: +

      +
    1. Uploading directly to the file store using scp/sftp/rsync
      2. +
    2. Uploading to a special 'uploads' directory using Webdav
      3. +
    +

    + +

    In the former case nothing else needs doing. In the second case an +admin has to move the files to the correct final location, so rememebr +to tell someone you've done it.

    + +

    Note that uploading photos does not automatically update the view +at http://expo.survex.com/photos/. An +update script needs to be run. This should run once/day around +midnight UTC, but may be broken. Prod a web admin.

    + +

    Installing FireFTP

    + +

    Works on Windows, Mac, Linux, Android.

    + +
      +
    1. Install the firefox web browser. You can download it and find +instructions here: http://www.mozilla.org/en-US/
      2. +
    2. Install the FireFTP addon. You can download this from addons.mozilla.org +
      3. +
    3. Restart firefox
      4. +
    4. Start FireFTP (its hidden in the tools menu under 'web developer'.
      5. +
    5. FireFTP will open in a new tab. You should have 2 largish squares +of files, one showing what should look like very familiar files and +folders from your computer on the left and one which is completely greyed +out on the right.
      6. +
    6. Select 'create an account' in the top left hand corner, a box full +of fields requiring information should appear.
      7. +
    7. Under the main tab you can set the account name to be whatever you +like, I suggest expo. Set the host to be: "expo.survex.com". +The login is expo and the password is the usual password (email me if you +cant remember). Under the connection tab you need to set the security to +be sftp. Everything else should be left alone.
      8. +
    8. Press connect and the expo websites files should magically appear in +the right hand side of the screen.
      9. +
    9. Upload your desired files to somewhere sensible using the green arrows +on the centre of the screen.
      10. +
    + +

    Using scp

    + +

    Works on Windows (using winscp), Linux (using scp), and no doubt mac and android with other tools.

    + +

    The above FireFTP is just one example of a tool that does this job

    + +
    +directory: /home/expo/expoimages/photos/2013/YourName
+server: expo.survex.com
+user: expo
+with the usual expo password
+protocol: sftp or scp
+
    + +

    Obviously replace 'YourName' with your actual name (no spaces)

    + +

    If you don't have winscp installed you can get it from here: +http://winscp.net/eng/index.php

    + +

    quick start guide: +http://winscp.net/eng/docs/getting_started

    + +

    screenshots: +http://winscp.net/eng/docs/screenshots

    + +

    Using Webdav

    + +

    This method can only upload under one special 'uploads' +directory. Ask someone tomove your uploaded files to the final +location.

    + +

    This is the upload dir: http://expo.survex.com/expoimages/uploads/ +

    You can use 'open as webfolder' on IE, or install this: +https://addons.mozilla.org/en-US/firefox/addon/open-as-webfolder/ on +firefox, you will get a pop-up box asking for authenticaion for +'expo-uploads'. The user is 'expo', the password is the usual +one. Once done you can just copy files in.

    + +

    Make a directory like photos/2013/YourName so we know what's +been uploaded. + +

    Command-line people can use the 'cadaver' client which is even +available for windows too: +http://www.phtagr.org/2009/04/01/cadaver-for-windows/

    + +

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

    + + +