From 511ed7db4b18dc8bc083f89694b3a7380f98d1d6 Mon Sep 17 00:00:00 2001 From: ExpoOnServer Date: Sun, 10 Jun 2012 09:44:23 +0100 Subject: [PATCH] change found before expo 2012 on expo website --- handbook/update.htm | 118 +-- infodx.htm | 8 + photos/thumbs/andyw_thumbnail_image.jpg | Bin 2753 -> 2753 bytes .../thumbs/clive_george_thumbnail_image.jpg | Bin 1691 -> 1694 bytes .../thumbs/julian_shilton_thumbnail_image.jpg | Bin 3117 -> 3122 bytes photos/thumbs/nialp_thumbnail_image.jpg | Bin 3908 -> 3913 bytes photos/thumbs/nickt_thumbnail_image.jpg | Bin 2903 -> 2903 bytes photos/thumbs/rmt_thumbnail_image.jpg | Bin 2936 -> 2936 bytes photos/thumbs/sandeep_thumbnail_image.jpg | Bin 3219 -> 3218 bytes photos/thumbs/tonyr_thumbnail_image.jpg | Bin 2927 -> 2927 bytes photos/thumbs/wook91_thumbnail_image.jpg | Bin 6568 -> 6568 bytes update.htm | 145 +-- updateweb | 12 +- years/1977/report.htm | 840 +++--------------- years/2002/goals.htm | 245 ++--- 15 files changed, 235 insertions(+), 1133 deletions(-) diff --git a/handbook/update.htm b/handbook/update.htm index be7d9096a..568f4f1e0 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -1,96 +1,40 @@ - + - CUCC Expedition Handbook: Updating the website - -

CUCC Expedition Handbook

-

Updating the website - HOWTO

-Please refer to the latest web updating guide in CUCC website +

CUCC Expedition Handbook

+

Updating the website - HOWTO

+

Please refer to the latest web updating guide in CUCC website

+
+

DExpo data is kept in a number of different locations.

+
Loser
Contains the survex data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/loser
Expoweb
Contains the current website. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/expoweb
Tunnel data
Contains the tunnel data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/tunneldata
Troggle
Contains the unfinished Django based website. Mercurial repository https://goatchurch@troggle.googlecode.com/hg/ troggle
Scanned notes
Scans of survey notes and drawn up surveys. Can be got via rsync.
+

Mercurial is a distributed revision control system. On expo this means that many people can edit and merge their changes with each other either when they can access the internet. Mercurial is over the top for scanned survey notes, which do not get modified, so they are kept as a plain directory of files.

+

If you run windows, you are recommended to install Tortoise Hg, which nicely interfaces with windows explorer.

+

Get the repositories

+

Mercurial

+

Linux

+

hg clone RepositoryURL

+

Windows

+

InstallTortoise Hg. In windows explorer right click, select Tortoise Hg .. and click Clone repository.
Set the source path to RepositoryURL
Set the destination to somewhere on your local harddisk.
Press clone.

+

RSync

+

Linux

+

rsync -av expoimages expo@seagrass.goatchurch.org.uk:

+

Windows

+

Not sure yet

+

The website conventions bit

+

This is likely to change with structural change to the site, with style changes which we expect to implement and with the method by which the info is actually stored and served up.

+

... and it's not written yet, either :-)

+
-Expo data is kept in a number of different locations. - -
-
Loser
-
Contains the survex data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/loser
-
Expoweb
-
Contains the current website. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/expoweb
-
Tunnel data
-
Contains the tunnel data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/tunneldata
-
Troggle
-
Contains the unfinished Django based website. Mercurial repository https://goatchurch@troggle.googlecode.com/hg/ troggle
-
Scanned notes
-
Scans of survey notes and drawn up surveys. Can be got via rsync.
-
- -

Mercurial is a distributed revision control system. On expo this means that -many people can edit and merge their changes with each other either when they can access -the internet. Mercurial is over the top for scanned survey notes, which do not get modified, so -they are kept as a plain directory of files. - -

If you run windows, you are recommended to install -Tortoise Hg, which nicely interfaces with -windows explorer. - -

Get the repositories

-

Mercurial

-

Linux

-hg clone RepositoryURL -

Windows

-InstallTortoise Hg. - -In windows explorer right click, select Tortoise Hg .. and click Clone repository. -
Set the source path to RepositoryURL -
Set the destination to somewhere on your local harddisk. -
Press clone. - -

RSync

-

Linux

-rsync -av expoimages expo@seagrass.goatchurch.org.uk: -

Windows

-Not sure yet - -

The website conventions bit

- -

This is likely to change with structural change to the site, with style -changes which we expect to implement and with the method by which the -info is actually stored and served up.

- -

... and it's not written yet, either :-)

- - - -
- - diff --git a/infodx.htm b/infodx.htm index 2e63cc57f..fce655fb6 100644 --- a/infodx.htm +++ b/infodx.htm @@ -53,6 +53,14 @@ +

Current data

+ +

Data for display with aven.

+

+ +

Everything