From 20cb4e3bb4240f2bc8542cb4bd68346618f75350 Mon Sep 17 00:00:00 2001
From: expoonserver
Date: Sun, 20 Mar 2016 01:39:45 +0000
Subject: [PATCH 1/2] Add thumbnail for nat dalton pic
---
photos/thumbs/natdalton_thumbnail_image.jpg | Bin 0 -> 2699 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100755 photos/thumbs/natdalton_thumbnail_image.jpg
diff --git a/photos/thumbs/natdalton_thumbnail_image.jpg b/photos/thumbs/natdalton_thumbnail_image.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..a8ee1ddec780f01a2992e6244ce3550ac2d1aa57
GIT binary patch
literal 2699
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
literal 0
HcmV?d00001
From df598117a679acbc866023130adf111bcf9e43c3 Mon Sep 17 00:00:00 2001
From: expoonserver
Date: Sun, 20 Mar 2016 01:55:36 +0000
Subject: [PATCH 2/2] Lots of 'expoimages' -> 'expofiles' fixes
---
1623/204/l/pussyprance_slot.html | 2 +-
handbook/index.htm | 2 +-
handbook/update.htm | 12 ++++++------
handbook/uploading.html | 6 +++---
infodx.htm | 2 +-
katast.htm | 2 +-
noinfo/cave_data/1623-107.html | 4 ++--
noinfo/cave_data/1623-148.html | 6 +++---
noinfo/cave_data/1623-264.html | 2 +-
noinfo/cave_data/1623-81.html | 2 +-
noinfo/entrance_data/1623-2001-02.html | 2 +-
noinfo/entrance_data/1623-2001-03.html | 2 +-
noinfo/entrance_data/1623-2012-ns-03.html | 4 ++--
noinfo/entrance_data/1623-2012-ns-09b.html | 2 +-
noinfo/entrance_data/1623-2012-ns-13b.html | 2 +-
noinfo/entrance_data/1623-204f.html | 2 +-
noinfo/entrance_data/1623-231b.html | 4 ++--
noinfo/entrance_data/1623-231c.html | 2 +-
noinfo/entrance_data/1623-231g.html | 2 +-
noinfo/entrance_data/1623-231i.html | 2 +-
noinfo/entrance_data/1623-244.html | 4 ++--
pubs.htm | 12 ++++++------
years/2010/index.html | 2 +-
years/2012/index.html | 2 +-
years/2013/index.html | 2 +-
years/2014/index.html | 2 +-
years/2014/logbook.html | 4 ++--
years/2015/index.html | 4 ++--
28 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/1623/204/l/pussyprance_slot.html b/1623/204/l/pussyprance_slot.html
index b856cdca0..63ce0c528 100644
--- a/1623/204/l/pussyprance_slot.html
+++ b/1623/204/l/pussyprance_slot.html
@@ -15,7 +15,7 @@
Ian Walker ascending the slot at the top of Hammer and Thong pitch in Pussyprance.
-
+
Photo © Edvin Deadman 2009
diff --git a/handbook/index.htm b/handbook/index.htm
index 8bad36546..b7ff5ad34 100644
--- a/handbook/index.htm
+++ b/handbook/index.htm
@@ -28,7 +28,7 @@
- Website and Data
- This tells you how the website and cave data are arranged, accessed and used.
-- Uploading files to 'expoimages'
+- Uploading files to 'expofiles'
- How to upload photos/reports/surveys/documents/scans to the
filestore section of the website. For larger files that are too fat to
be in the website repository (generaly anything bigger than 200KB).
diff --git a/handbook/update.htm b/handbook/update.htm
index 771662229..6ebdda3fc 100644
--- a/handbook/update.htm
+++ b/handbook/update.htm
@@ -117,13 +117,13 @@ stored just as files (not in version control). See below for details on that.
Photos, scans (logbooks, drawn-up cave segments) (This is about
16GB of stuff which you probably don't actually need locally) To sync
-the files from the server to local expoimages directory:
+the files from the server to local expofiles directory:
-rsync -av expo@expo.survex.com:expoimages /home/expo
+rsync -av expo@expo.survex.com:expofiles /home/expo
To sync the local expoimage directory back to the server:
-rsync -av /home/expo/expoimages expo@expo.survex.com:
+rsync -av /home/expo/expofiles expo@expo.survex.com:
(do be careful not to delete piles of stuff then rsync back - as it'll all get deleted on the server too, and we may not have backups!). Use rsync --dry-run --delete-after -a to check what would be deleted.
@@ -246,7 +246,7 @@ T/U: Jess 1 hr, Emma 0.5 hr
Photos are stored in the general file area of the site under http://expo.survex.com/expoimages/photos/
+href="http://expo.survex.com/expofiles/photos/">http://expo.survex.com/expofiles/photos/
They are organised by year, and by photographer. Please use directory
names like 2014/YourName (i.e no spaces, CamelCase for names).
@@ -255,8 +255,8 @@ href="http://expo.survex.com/photos/">http://expo.survex.com/photos/
Photos can be uploaded in 2 basic ways:
-- Rsync,scp,sftp as user 'expo' to expo.survex.com, into the directory expoimages/photos/<year>/<PhotographerName>
-- Webdav upload to special dir http://expo.survex.com/expoimages/uploads/<year>/<PhotographerName>
+- Rsync,scp,sftp as user 'expo' to expo.survex.com, into the directory expofiles/photos/<year>/<PhotographerName>
+- Webdav upload to special dir http://expo.survex.com/expofiles/uploads/<year>/<PhotographerName>
See Photo/File Upload Instructions for
diff --git a/handbook/uploading.html b/handbook/uploading.html
index 3051c1262..58189452d 100644
--- a/handbook/uploading.html
+++ b/handbook/uploading.html
@@ -9,7 +9,7 @@
CUCC Expedition Handbook
Uploading photos and files
-The expo website has a big section under 'expoimages' that is not part of the repositories. This section describes how to move files into that area. It supports 2 basic methods of upload:
+
The expo website has a big section under 'expofiles' that is not part of the repositories. This section describes how to move files into that area. It supports 2 basic methods of upload:
- Uploading directly to the file store using scp/sftp/rsync
- Uploading to a special 'uploads' directory using Webdav
@@ -63,7 +63,7 @@ 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/2015/YourName
+directory: /home/expo/expofiles/photos/2015/YourName
server: expo.survex.com
user: expo
with the usual expo password
@@ -87,7 +87,7 @@ http://winscp.net/eng/docs/screenshots
directory. Ask someone to move your uploaded files to the final
location. But you may not need any extra software.
- This is the upload dir: http://expo.survex.com/expoimages/uploads/
+
This is the upload dir: http://expo.survex.com/expofiles/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
diff --git a/infodx.htm b/infodx.htm
index 370dea62b..b67337c26 100644
--- a/infodx.htm
+++ b/infodx.htm
@@ -45,7 +45,7 @@
Survey information
Area Description
diff --git a/katast.htm b/katast.htm
index 0b5e2e15d..d9c5027cc 100644
--- a/katast.htm
+++ b/katast.htm
@@ -43,7 +43,7 @@ fabricated aluminium tags with our own internal number as a temporary
measure during early exploration; our practices are documented in the Prospecting Handbook. Once a cave has been
accurately located and explored sufficiently to count as a significant find, a
-form is filled out and sent to
+form is filled out and sent to
the VfHO, who will allocate a final kataster number.
If caves have been explored by groups not recognised by the local cavers,
diff --git a/noinfo/cave_data/1623-107.html b/noinfo/cave_data/1623-107.html
index dd30a2dc9..bd754be3e 100644
--- a/noinfo/cave_data/1623-107.html
+++ b/noinfo/cave_data/1623-107.html
@@ -39,8 +39,8 @@ Jenny extended in 2012/2013
Big rift series
A pitch of 23m has an inlet entering part way down, which makes the rest of this pitch and the following one of 19m unpleasant in wet weather. Two ways then lead on, either down with the water or by traversing round this drop to another passage.
Climbing down with the water leads to a short passage with the water in a rift below. Round a sharp corner is a short drop to the head of a larger rift. A 5m pitch down this leads to another rift which, in turn, leads out to the side of a large shaft. Stones dropped from a small hole in the corner of the passage above the 5m pitch also fall into this shaft. Laddering from the side, the pitch is 67m with a large ledge just above half-way, and is unpleasantly wet in poor weather. From the base of this pitch, the continuing rift/canyon trends south west and has pitches of 5, 9 and 8m before the other route drops in from above.
Over the traverse, a short pitch of 4.5m, followed by a short climb up, leads to the head of a pitch of 10m to a boulder floor. Two ways on from here are down through the boulders into a shaft, or across the shaft and into a narrow rift. The way through boulders soon chokes, but the narrow rift soon opens into a massive shaft of 100m with a rebelay roughly halfway. This drops directly into the rift reached by the original route.
Below the junction, the rift continues with a 5m climb and pitches of 5, 14 and 44m, this last pitch being quite wet and emerging into a massive cross-rift trending south east. The water disappears into the choked floor of this rift via a nasty wet crawl, rapidly becoming too small.
-2013 Plan
-2013 Elevation
+2013 Plan
+2013 Elevation
1978 (grade 5) survey
diff --git a/noinfo/cave_data/1623-148.html b/noinfo/cave_data/1623-148.html
index bdab8d8a6..cd99f9cfb 100644
--- a/noinfo/cave_data/1623-148.html
+++ b/noinfo/cave_data/1623-148.html
@@ -27,11 +27,11 @@
Extended Elevation of 148 and 81 (2012):
-
+
Plan of 148 (2012):
-
+
Area plan, showing 81, 82, 107, 148, 1987-02, 2006-06 and 2006-76 (2012):
-
+
There is also a 1980s survey area plan, drawn at 1:2000, showing 145, 82 and 148 on Gauß and Krüger
coordinates.
diff --git a/noinfo/cave_data/1623-264.html b/noinfo/cave_data/1623-264.html
index 12ad3a632..e623452ad 100644
--- a/noinfo/cave_data/1623-264.html
+++ b/noinfo/cave_data/1623-264.html
@@ -27,7 +27,7 @@
5m handline and ~120m for entrance shaft
Brief description and sketch in 2002#31; 2005 log book.
-../expoimages/surveys/balconyhohle.png
+../expofiles/surveys/balconyhohle.png
diff --git a/noinfo/cave_data/1623-81.html b/noinfo/cave_data/1623-81.html
index 1ba549962..2ab1f3ffc 100644
--- a/noinfo/cave_data/1623-81.html
+++ b/noinfo/cave_data/1623-81.html
@@ -27,7 +27,7 @@
Extended Elevation of 148 and 81 (2012):
-
+
Area plan, showing 81, 82, 107, 148, 1987-02, 2006-06 and 2006-76 (2012):
Compare with original Grade 1 extended elevation in Cambridge Underground expedition report
diff --git a/noinfo/entrance_data/1623-2001-02.html b/noinfo/entrance_data/1623-2001-02.html
index f545faae0..8aae57a04 100644
--- a/noinfo/entrance_data/1623-2001-02.html
+++ b/noinfo/entrance_data/1623-2001-02.html
@@ -16,7 +16,7 @@
-