From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Wed, 26 Apr 2006 06:13:40 +0000 (+0000)
Subject: new look and feel
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5aad9ed12c4e9f57ab7d707ab573a450dc1cae74;p=rrdtool-all.git

new look and feel


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@803 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/website/.htaccess b/website/.htaccess
index 669b99ed..348dfa09 100644
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -1,6 +1,11 @@
+DirectoryIndex index.en.html index.html
 ErrorDocument 404 http://oss.oetiker.ch/rrdtool/404.var
 RewriteEngine On
 RewriteRule pub/(.*) http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/$1 [R=301,L]
 RewriteRule pub$ http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/ [R=301,L]
 RewriteRule index.html http://oss.oetiker.ch/rrdtool/ [R=302,L]
 RewriteRule download.html http://oss.oetiker.ch/rrdtool/download.en.html [R=302,L]
+<FilesMatch ".htaccess">
+  Order Allow,Deny
+  Allow From All
+</FilesMatch>
diff --git a/website/btdmd8.png b/website/btdmd8.png
new file mode 100644
index 00000000..ba559d81
Binary files /dev/null and b/website/btdmd8.png differ
diff --git a/website/hoster.html b/website/hoster.html
index b8d5f68d..d3885521 100644
--- a/website/hoster.html
+++ b/website/hoster.html
@@ -6,7 +6,8 @@
 body {
     margin: 0px;
     padding: 0px;
-    background-color: rgb(96, 96, 96);
+    background-color: #f0f0f0;
+    font-family: sans-serif;
 }
 
 #hoster a {
diff --git a/website/inc/design.css b/website/inc/design.css
index 4a913ef6..310c6d98 100644
--- a/website/inc/design.css
+++ b/website/inc/design.css
@@ -1,6 +1,4 @@
 body {
-  background-color: white;
-  color: black;
   margin: 30px;
   padding: 0px;
   font-family: sans-serif;
@@ -18,7 +16,6 @@ body {
 table#frame  {
         width: 100%;
         border-collapse: collapse;
-        background-color: #1a1a1a;
 }
 
 table#frame td {
@@ -32,7 +29,6 @@ table#frame td {
  * body              
  **************************/
 div#body {
-  color: white;
   margin: 40px;
   margin-top: 80px;
 }
@@ -46,11 +42,10 @@ div#body h1 {
   font-size: 220%;
   border-bottom-style: solid;
   border-bottom-width: 4px;
-  border-bottom-color: #404040;
+  border-bottom-color: #808080;
 }
 
 div#body h2 { 
-  color: white;
   margin-top: 0.6em;
   margin-bottom: 0.1em;
 }
@@ -61,7 +56,7 @@ div#body a {
 }
 
 div#body a[name] {
-  color: white;
+  color: black;
 }
 
 div#body a:hover {
@@ -71,8 +66,12 @@ div#body a:hover {
 div#body h2 a,
 div#body h3 a,
 div#body h4 a,
-div#body h5 a {
-  color: white;
+div#body h5 a,
+div#body h2,
+div#body h3,
+div#body h4,
+div#body h5 {
+  color: #606060;
 }
 
 div#body dl dd {
@@ -97,23 +96,23 @@ div#body pre {
   border-style: solid;
   border-color: #bfbfbf;
   border-width: 1px;  
-  background-color: #606060;
+  background-color: #E8E8E8;
   padding: 1em;
 }
 
 div#body pre a{
-  color: white;
+  color: black;
 }
 
 div#googlead_right {
-  background-color: #1a1a1a;
+  background-color: white;
   float: right;
   margin-top: 31px;
   padding-left: 20px;
   margin-left: 20px;
   border-left-width: 1px;
   border-left-style: solid;
-  border-left-color: #404040;
+  border-left-color: #808080;
   padding-right: 0px;
   padding-bottom: 10px;
 }
@@ -126,18 +125,15 @@ table#frame td#footcell {
 }
 
 div#address  {
-  float: right;
-  margin: 30px;
-  padding-right: 12px;
 }
 
 div#address small {
-  color: #b0b0b0;
+  color: #202020;
   font-size: 90%;
 }
 
 div#address a {
-  color: #b0b0b0;
+  color: #202020;
   text-decoration: none;
 }
 
@@ -147,11 +143,11 @@ div#address a {
 
 div#logo {
   position: absolute;
-  height: 62px;
-  width: 187px;
+  height: 78px;
+  width: 190px;
   right: 69px;
-  top: 60px;
-  background-image: url("rrdtool-theme.png");
+  top: 40px;
+  background-image: url("rrdtool-3dlogo.png");
 }
 
 /**************************
@@ -159,7 +155,7 @@ div#logo {
  **************************/
 
 div.rrdworld h3 {
-  background: #202050;
+  background: #E0E0F0;
   margin-top: 0.1em;
   margin-bottom: 0.3em;
   padding: 3px;  
@@ -169,7 +165,7 @@ div.rrdworld {
   border-style: solid;
   border-color: #bfbfbf;
   border-width: 1px;  
-  background-color: #404040;
+  background-color: #D0D0D0;
   padding: 1em;
   margin-top: 0.5em;
   margin-bottom: 1em;
@@ -198,12 +194,11 @@ div#mirrors a {
 table#frame td#leftcornercell,
 table#frame td#menucell {
   width: 10%;
-  background-color: #606060;
+  background-color: #F0F0F0;
 }
 
 div#menu {
   font-weight: normal;
-  color: white;
   margin-top: 20px;
   margin-left: 20px;
   margin-right: 20px;
@@ -253,15 +248,15 @@ div#menu ul ul ul li {
 }
 
 div#menu a:hover {
-  color: #a6a4f5;
+  color: #5c5b8a;
 }
 
 div#menu a:active {
-  color: #7b7aba;
+  color: #373672;
 }
 
 div#menu li div.selected {
-  color: white;
+  color: 1d255f;
   font-weight: bold;
 }
 
diff --git a/website/inc/rrdtool-design.xar b/website/inc/rrdtool-design.xar
index 7f03a7c3..0f524792 100644
Binary files a/website/inc/rrdtool-design.xar and b/website/inc/rrdtool-design.xar differ
diff --git a/website/inc/template.inc b/website/inc/template.inc
index 8fa4b72e..15037fdb 100644
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -90,11 +90,11 @@ google_ad_height = 600;
 google_ad_format = "160x600_as";
 google_ad_type = "text";
 google_ad_channel ="5627785043";
-google_color_border = "1A1A1A";
-google_color_bg = "303030";     
-google_color_link = "66A5E0";      
-google_color_url = "E0BBE8";      
-google_color_text = "D0D0D0";
+google_color_border = "ffffff";
+google_color_bg = "f0f8ff";     
+google_color_link = "2c3fbf";      
+google_color_url = "6851b0";      
+google_color_text = "000000";
 //--></script>
 <script type="text/javascript"
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
@@ -133,7 +133,7 @@ LINE
 </small>
 </div>
 <perl>
-if ( -s "$(WML_SRC_FILENAME)" > 4000 ) {
+if ( -s "$(WML_SRC_BASENAME).en/html" > 15000 ) {
 print <<'GOOGLEAD';
 <p>
 <script type="text/javascript"><!--
@@ -143,11 +143,11 @@ google_ad_height = 90;
 google_ad_format = "728x90_as";
 google_ad_type = "text";
 google_ad_channel ="6085696737";
-google_color_border = "616FC5";
-google_color_bg = "202020";     
-google_color_link = "66A5FF";      
-google_color_url = "FFBBE8";      
-google_color_text = "FFFFFF";
+google_color_border = "ffffff";
+google_color_bg = "f0f8ff";     
+google_color_link = "2c3fbf";      
+google_color_url = "6851b0";      
+google_color_text = "000000";
 //--></script>
 <script type="text/javascript"
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
diff --git a/website/index.wml b/website/index.wml
index 5eb17862..e373419d 100644
--- a/website/index.wml
+++ b/website/index.wml
@@ -9,7 +9,10 @@
 <p>Some call it the industry standard data logging and graphing application.
 Others use it to write their very own full custom monitoring scripts.
 Most people will probably get in touch with RRDtool through some
-<a href="$(ROOT)/rrdworld/">third party monitoring applications</a>.</p>
+<a href="$(ROOT)/rrdworld/">third party</a> monitoring applications. You
+may have seen graphs like this:</p>
+
+<p><img src="btdmd8.png"/></p>
 
 <P>RRD is the Acronym for Round Robin Database. RRD is a system to store and
 display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -23,7 +26,7 @@ via simple shell scripts or as a perl module.</P>
 Currently it compiles on a number of different Unix platforms as well as on
 Windows.</P>
 
-<h2>All new RRDtool 1.2 released</h2>
+<h2>Upgrading from 1.0.x?</h2>
 
 <p>If you are curious about the new features in RRDtool 1.2. Check out the
 <a href="newin12.txt">RRDTOOL 1.2 NEWS</a> page.</p>
diff --git a/website/site-sync b/website/site-sync
index e9984efc..4f081789 100755
--- a/website/site-sync
+++ b/website/site-sync
@@ -21,7 +21,8 @@ wget --no-host-directories --timestamping --recursive --level=1 http://oss.oetik
 body {
     margin: 0px;
     padding: 0px;
-    background-color: #909090;
+    background-color: #f0f0f0;
+    font-family: sans-serif;
 }
 
 #hoster a {