From 3c207a91d0e29fdb6f448081526bee523bc7bc8d Mon Sep 17 00:00:00 2001 From: aiora Date: Tue, 16 Jul 2013 20:50:14 +0100 Subject: [PATCH] css enhancements, fixes in updata html code --- css/main2.css | 17 +++++++++++++++-- handbook/update.htm | 17 ++++++++--------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/css/main2.css b/css/main2.css index 99f8cd406..ca60bfd16 100644 --- a/css/main2.css +++ b/css/main2.css @@ -8,7 +8,7 @@ body { background: #fff url(../images/style/bg-cambridge-caving-expedition.png) repeat-x 0 0; color: #000; - font-family: 'Palatino Linotype','Book Antiqua',Palatino,serif; + font-family: 'Palatino Linotype','Book Antiqua', Palatino, Garamond, serif; font-size: 12pt; margin-left: 275px; margin-right: 100px; @@ -17,8 +17,9 @@ body { } body#homepage { background: #008787 url(../images/style/homebackground.jpg) no-repeat 0 0; + background-size: 140% auto; color: #fff; - font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; + font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana, Arial, Helvetica, Sans-Serif; margin: 80px; text-align: left; } @@ -61,6 +62,12 @@ dd { div.clear { clear: both; } +tt, code { /*code bits*/ + background: #ccc; + font-size: 0.8em; + padding: 10px 20px; + display: block; + } /*HEADINGS*/ h1, h2, h3, h4 { font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; @@ -289,6 +296,12 @@ table#cavepage th#status { text-align: right; width: 25%; } text-align: right; font-weight: bold; margin-bottom: 10px;} +/*html editor*/ +textarea#id_html { + width: 100%; + height: 60%; + } + /*RULES OVERRIDING JQUERY CSS FOR CAVES DESCRIPTION*/ /*This method is faster but less efficient. These would better be directly written in the jquery css file currently in http://expo.survex.com/site_media/css/redmond/jquery-ui-1.8.14.custom.css*/ diff --git a/handbook/update.htm b/handbook/update.htm index e36a41cac..6a21deb31 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -224,18 +224,17 @@ onwards you can just install mercurial and tortoisehg from synaptic, then restar

The site was moved to Julian Todd's seagrass server, but the change from 32-bit to 64-bit machines broke the website autogeneration code, which was only fixed in early 2011, allowing the move to complete. The data has been split into 3 separate repositories: the website, troggle, the survey data, the tunnel data.

-

Automation on cucc.survex.com/expo

+

Automation on cucc.survex.com/expo

The way things normally work, python or perl scripts turn CSV input into HTML for the website. Note that:

- - The CSV files are actually tab-separated, not comma-separated despite the extension. - The scripts can be very picky and editing the CSVs with microsoft excel has broken them in the past- not sure if this is still the case. - -Overview of the automagical scripts on the expo website Script location Input file Output file Purpose +

The CSV files are actually tab-separated, not comma-separated despite the extension.

+

The scripts can be very picky and editing the CSVs with microsoft excel has broken them in the past- not sure if this is still the case.

+

Overview of the automagical scripts on the expo website

+Script location Input file Output file Purpose /svn/trunk/expoweb/noinfo/make-indxal4.pl /svn/trunk/expoweb/noinfo/CAVETAB2.CSV many produces all cave description pages -/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://cucc.survex.com/expo/folk/index.htm Table of all expo members +
/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://cucc.survex.com/expo/folk/index.htm Table of all expo members -/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl +
/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl /svn/trunk/surveys/Surveys.csv http://cucc.survex.com/expo/surveys/surveytable.html http://cucc.survex.com/expo/surveys/surtabnam.html @@ -257,7 +256,7 @@ http://cucc.survex.com/expo/surveys/surveytable.html http://cucc.survex.com/expo

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:

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

Windows

Not sure yet

The website conventions bit