expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

css enhancements, fixes in updata html code

Browse Source
This commit is contained in:
aiora 2013-07-16 20:50:14 +01:00
parent 893ba38f7f
commit 3c207a91d0
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
css/main2.css
View File

@ -8,7 +8,7 @@
body { body {
background: #fff url(../images/style/bg-cambridge-caving-expedition.png) repeat-x 0 0; background: #fff url(../images/style/bg-cambridge-caving-expedition.png) repeat-x 0 0;
color: #000; color: #000;
font-family: 'Palatino Linotype','Book Antiqua',Palatino,serif; font-family: 'Palatino Linotype','Book Antiqua', Palatino, Garamond, serif;
font-size: 12pt; font-size: 12pt;
margin-left: 275px; margin-left: 275px;
margin-right: 100px; margin-right: 100px;
@ -17,8 +17,9 @@ body {
} }
body#homepage { body#homepage {
background: #008787 url(../images/style/homebackground.jpg) no-repeat 0 0; background: #008787 url(../images/style/homebackground.jpg) no-repeat 0 0;
background-size: 140% auto;
color: #fff; 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; margin: 80px;
text-align: left; text-align: left;
} }
@ -61,6 +62,12 @@ dd {
div.clear { div.clear {
clear: both; clear: both;
} }
tt, code { /*code bits*/
background: #ccc;
font-size: 0.8em;
padding: 10px 20px;
display: block;
}
/*HEADINGS*/ /*HEADINGS*/
h1, h2, h3, h4 { h1, h2, h3, h4 {
font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; 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; text-align: right;
font-weight: bold; font-weight: bold;
margin-bottom: 10px;} margin-bottom: 10px;}
/*html editor*/
textarea#id_html {
width: 100%;
height: 60%;
}
/*RULES OVERRIDING JQUERY CSS FOR CAVES DESCRIPTION*/ /*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*/ /*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*/

17
handbook/update.htm
View File

@ -224,18 +224,17 @@ onwards you can just install mercurial and tortoisehg from synaptic, then restar
<p>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.</p> <p>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.</p>
<h3><a id="">Automation on cucc.survex.com/expo</h3> <h3 id="automation">Automation on cucc.survex.com/expo</h3>
<p>The way things normally work, python or perl scripts turn CSV input into HTML for the website. Note that:</p> <p>The way things normally work, python or perl scripts turn CSV input into HTML for the website. Note that:</p>
<p>The CSV files are actually tab-separated, not comma-separated despite the extension.</p>
The CSV files are actually tab-separated, not comma-separated despite the extension. <p>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.</p>
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. <p>Overview of the automagical scripts on the expo website</p>
Script location Input file Output file Purpose
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-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 </br>/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 </br>/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl
/svn/trunk/surveys/Surveys.csv /svn/trunk/surveys/Surveys.csv
http://cucc.survex.com/expo/surveys/surveytable.html http://cucc.survex.com/expo/surveys/surtabnam.html 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
<p>Install<a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>. In windows explorer right click, select Tortoise Hg .. and click Clone repository. <br />Set the source path to RepositoryURL <br />Set the destination to somewhere on your local harddisk. <br />Press clone.</p> <p>Install<a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>. In windows explorer right click, select Tortoise Hg .. and click Clone repository. <br />Set the source path to RepositoryURL <br />Set the destination to somewhere on your local harddisk. <br />Press clone.</p>
<h3>RSync</h3> <h3>RSync</h3>
<h4>Linux</h4> <h4>Linux</h4>
<p>rsync -av expoimages expo@seagrass.goatchurch.org.uk:</p> <tt>rsync -av expoimages expo@seagrass.goatchurch.org.uk:</tt>
<h4>Windows</h4> <h4>Windows</h4>
<p>Not sure yet</p> <p>Not sure yet</p>
<h2>The website conventions bit</h2> <h2>The website conventions bit</h2>