Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[8959] trunk/www
|
From: <ai...@us...> - 2008-10-24 22:10:51
|
Revision: 8959
http://plplot.svn.sourceforge.net/plplot/?rev=8959&view=rev
Author: airwin
Date: 2008-10-24 22:10:46 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Implement configured versions of style_liquid.css and style_static.css. So
far only the sizes are configured, but the results for both configured
styles work well when hand-copied to the website and also validate (with
the colour warnings).
ToDo:
(1) configure the colors (which should get rid of the above colour warnings).
(2) replace current Makefile logic (which is limited to just the source tree
for copying to the website) with CMake logic (which can handle the
build-tree location of the configured style_liquid.css and style_static.css
when copying results to the website). Until this change is completed,
uploading the website automatically will not work and the configured results
must be uploaded by hand.
Modified Paths:
--------------
trunk/www/CMakeLists.txt
trunk/www/css/style.css.in
Added Paths:
-----------
trunk/www/css/CMakeLists.txt
Modified: trunk/www/CMakeLists.txt
===================================================================
--- trunk/www/CMakeLists.txt 2008-10-24 21:59:51 UTC (rev 8958)
+++ trunk/www/CMakeLists.txt 2008-10-24 22:10:46 UTC (rev 8959)
@@ -1,3 +1,24 @@
+# www/CMakeLists.txt for PLplot
+###
+### Process this file with cmake to produce Makefile
+###
+# Copyright (C) 2008 Alan W. Irwin
+#
+# This file is part of PLplot.
+#
+# PLplot is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# PLplot is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with PLplot; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/documentation.php.in
${CMAKE_CURRENT_BINARY_DIR}/documentation.php @ONLY
@@ -2 +23,2 @@
)
+add_subdirectory(css)
Added: trunk/www/css/CMakeLists.txt
===================================================================
--- trunk/www/css/CMakeLists.txt (rev 0)
+++ trunk/www/css/CMakeLists.txt 2008-10-24 22:10:46 UTC (rev 8959)
@@ -0,0 +1,84 @@
+# www/css/CMakeLists.txt for PLplot
+###
+### Process this file with cmake to produce Makefile
+###
+# Copyright (C) 2008 Alan W. Irwin
+#
+# This file is part of PLplot.
+#
+# PLplot is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# PLplot is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with PLplot; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+# Variables to control configuration of CSS files.
+
+# Colours:
+
+# Our colour style uses few colours which are duplicated over a large number
+# of different contexts so relatively few CMake variables are required to
+# configure our colour style.
+
+# Widths and heights:
+
+# N.B. all configured widths and heights are expressed in percentages
+# appropriate for the liquid style sheet. To convert to static style sheet
+# numbers simply multiply all these numbers primarily by 800/100 but
+# sometimes by other factors when percentages are nested.
+set(per_cent_width_pagewrapper 95)
+set(per_cent_width_rightside 23)
+set(per_cent_width_fullside 100)
+set(per_cent_width_leftside 75)
+set(per_cent_width_featurebox 31)
+set(per_cent_height_pagefooter 8)
+set(per_cent_width_codebox 92)
+set(per_cent_width_searchbar 14)
+
+# Liquid style:
+set(width_pagewrapper "${per_cent_width_pagewrapper}%")
+set(width_rightside "${per_cent_width_rightside}%")
+set(width_fullside "${per_cent_width_fullside}%")
+set(width_leftside "${per_cent_width_leftside}%")
+set(width_featurebox "${per_cent_width_featurebox}%")
+set(height_pagefooter "${per_cent_height_pagefooter}%")
+set(width_codebox "${per_cent_width_codebox}%")
+set(width_searchbar "${per_cent_width_searchbar}%")
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/style.css.in
+ ${CMAKE_CURRENT_BINARY_DIR}/style_liquid.css @ONLY
+ )
+
+# static style:
+math(EXPR static_width_pagewrapper "${per_cent_width_pagewrapper}*(800/100)")
+math(EXPR static_width_rightside "${per_cent_width_rightside}*(700/100)")
+math(EXPR static_width_fullside "${per_cent_width_fullside}*(700/100)")
+math(EXPR static_width_leftside "${per_cent_width_leftside}*(700/100)")
+math(EXPR static_width_featurebox "${per_cent_width_featurebox}*(800/100)")
+math(EXPR static_height_pagefooter "${per_cent_height_pagefooter}*(800/100)")
+math(EXPR static_width_codebox "${per_cent_width_codebox}*(700/100)")
+math(EXPR static_width_searchbar "${per_cent_width_searchbar}*(800/100)")
+
+set(width_pagewrapper "${static_width_pagewrapper}px")
+set(width_rightside "${static_width_rightside}px")
+set(width_fullside "${static_width_fullside}px")
+set(width_leftside "${static_width_leftside}px")
+set(width_featurebox "${static_width_featurebox}px")
+set(height_pagefooter "${static_height_pagefooter}px")
+set(width_codebox "${static_width_codebox}px")
+set(width_searchbar "${static_width_searchbar}px")
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/style.css.in
+ ${CMAKE_CURRENT_BINARY_DIR}/style_static.css @ONLY
+ )
+
Property changes on: trunk/www/css/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/www/css/style.css.in
===================================================================
--- trunk/www/css/style.css.in 2008-10-24 21:59:51 UTC (rev 8958)
+++ trunk/www/css/style.css.in 2008-10-24 22:10:46 UTC (rev 8959)
@@ -6,7 +6,16 @@
body {
text-align: center;
- background: #F4FDE5 top center no-repeat fixed;
+ background-color: #F4FDE5;
+/* Could configure the url for the static style and use a pseudo scaling
+ background for the liquid style, but none looks fine in all cases so
+ don't bother with anything more fancy than that. */
+/* background-image: url('../img/bg.jpg');*/
+ background-image: none;
+ background-position: top center;
+ background-repeat: no-repeat;
+ background-attachment: fixed;
+
margin-top:10px;
margin-bottom:10px;
}
@@ -27,7 +36,7 @@
#pagewrapper {
margin-left: auto;
margin-right: auto;
- width: 95%;
+ width: @width_pagewrapper@;
text-align: left;
background: #FFFFFF top right repeat-y;
border: 1px solid #018843;
@@ -36,7 +45,7 @@
#pagewrapper_full {
margin-left: auto;
margin-right: auto;
- width: 95%;
+ width: @width_pagewrapper@;
text-align: left;
background: #FFFFFF;
border: 1px solid #018843;
@@ -126,7 +135,7 @@
#rightside {
margin-top:5px;
float: right;
- width:23%;
+ width:@width_rightside@;
border:0px dashed #cccccc;
}
@@ -153,14 +162,14 @@
#fullside {
float:left;
- width:100%;
+ width:@width_fullside@;
background: #FFFFFF;
border:0px dashed #cccccc;
}
#leftside {
float: left;
- width:75%;
+ width:@width_leftside@;
background-color: #FFFFFF;
border:0px dashed #cccccc;
}
@@ -210,7 +219,7 @@
#featurebox {
float:left;
- width:31%;
+ width:@width_featurebox@;
background-color: #F6FCEC;
border:1px solid #AAE5A4;
padding:10px;
@@ -237,7 +246,7 @@
}
#pagefooter {
- height: 7.5%;
+ height:@height_pagefooter@ ;
background-color: #99CC33;
clear: both;
}
@@ -257,7 +266,7 @@
}
#codebox {
- width:92%;
+ width:@width_codebox@;
height:400px;
font-size:0.7em;
background-color:#f2f8e6;
@@ -301,7 +310,7 @@
#searchbar #s{
height:1.2em;
-width:14%;
+width:@width_searchbar@;
margin:0 5px 0 0;
border:1px solid #a0a0a0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
