updtes

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

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 6b2d67b80d30565f243aea48ccd56a638de75c5f..b030bc7fc599899618290e5007a05ac59e948f45 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -149,6 +149,14 @@ google_ad_height = 250;
 <div class="image"><img src="mmh11_er.png" alt="" width="267" height="321" /></div>
 <div class="caption">Simply parse of SNMPget from Vendor OID. The graph display the actual send a PAP push to the mobile, possibile errors due to get to HLR and retrieve for mobile. -- Alex Rivoltella &lt;alessio.r-delme-@<span class="legacy">XYZ-</span>tiscalinet.it&gt;, 2006/3</div>
 </div>
+<!-- no wider than 600 pixle -->
+<!-- creation date -->
+<!-- Optional -->
+<div class="gallery">
+<h2>Traffic jam statistics Netherlands</h2>
+<div class="image"><img src="filegroei.png" alt="" width="581" height="311" /></div>
+<div class="caption">RRD with number of dutch traffic jams, length, weather, prediction and 24h ago -- Jeroen Wunnink &lt;info@<span class="legacy">XYZ-</span>filegroei.nl&gt;, 2008/5 <a href="http://www.filegroei.nl">[demo]</a></div>
+</div>
 <div class="gallery">
 <h2>SIP Messages Last Week</h2>
 <div class="image"><img src="sip_messages_week.png" alt="" width="697" height="503" /></div>
@@ -158,15 +166,6 @@ google_ad_height = 250;
 <!-- creation date -->
 <!-- Optional -->
 <div class="gallery">
-<h2>Cubemon</h2>
-<div class="image"><img src="cubemon.png" alt="" width="594" height="410" /></div>
-<div class="caption">Cubemon - Real-Time openGL rotating .png images from RRDTool. Images generated by stats from monitored devices rotate in cubes. This example showing 26 devices at once -- Hamish Marson &lt;hamish@<span class="legacy">XYZ-</span>travellingkiwi.com&gt;, 2008/4</div>
-</div>
-<!-- no wider than 600
-pixle -->
-<!-- creation date -->
-<!-- Optional -->
-<div class="gallery">
 <p><script type="text/javascript">
 //<![CDATA[
 <!--
@@ -185,6 +184,15 @@ google_color_text = "000000";
 //]]>
 </script> <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script></p>
+<h2>Cubemon</h2>
+<div class="image"><img src="cubemon.png" alt="" width="594" height="410" /></div>
+<div class="caption">Cubemon - Real-Time openGL rotating .png images from RRDTool. Images generated by stats from monitored devices rotate in cubes. This example showing 26 devices at once -- Hamish Marson &lt;hamish@<span class="legacy">XYZ-</span>travellingkiwi.com&gt;, 2008/4</div>
+</div>
+<!-- no wider than 600
+pixle -->
+<!-- creation date -->
+<!-- Optional -->
+<div class="gallery">
 <h2>Sinus-Regression of Server-Traffic</h2>
 <div class="image"><img src="sintraf.png" alt="" width="597" height="227" /></div>
 <div class="caption">This graph shows the traffic of a networkinterface(dark-green). In red is displayed the optimal sinus-curve thru the points of one week. Light-green is the "can-be-range" of the traffic that was not alarmed. Yellow is the "warning-range" of the curve and every other points cause an CRITICAL-Warning in our minitoring. So we bring the statistics-calculations into the monitoring. That will show us abnormaly using of different curves and alarm it. -- Holger Kohn &lt;holger@<span class="legacy">XYZ-</span>kohn-nf.de&gt;, 2008/1 <a href="http://www.kohn-nf.de">[demo]</a></div>

diff --git a/website/inc/template.inc b/website/inc/template.inc
index 1fdddf16fb4ea8abf50cf6358249c8e77d911cda..824623b434479a99f62255c9671ade5d0364ec69 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -49,7 +49,7 @@
 <tr><td nowrap="nowrap" valign="top" align="left" height="32">
 <input type="hidden" name="domains" value="oss.oetiker.ch"></input>
 <label for="sbi" style="display: none">Enter your search terms</label>
-<input type="text" name="q" size="31" maxlength="255" value="" id="sbi"></input>
+<input type="text" name="q" style="width: 180px" maxlength="255" value="" id="sbi"></input>
 </td></tr>
 <tr>
 <td nowrap="nowrap">
@@ -199,11 +199,14 @@ res are missing, then the mirror may not have picked up the contents of the <a h
 #<a href="http://www.konqueror.org">Konqueror</a> aus dem KDE Projekt.
 #</de>
 </p> 
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 </script>
 <script type="text/javascript">
-_uacct = "UA-374525-1";
-urchinTracker();
+var pageTracker = _gat._getTracker("UA-374525-1");
+pageTracker._initData();
+pageTracker._trackPageview();
 </script>
 </body>
 </html>

diff --git a/website/index.wml b/website/index.wml
index b3d0c7704328aa75ff9ec45fe975cec128d2050a..d96d9c538f43bf10501d2e5bf045fa4301fad3fa 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -8,13 +8,10 @@
 
 <H2>News</H2>
 
-<p>RRDtool 1.3 Beta 4 is out. Read about the features on
+<p>RRDtool 1.3rc9. Read about the features on
 <a href="http://oss.oetiker.ch/rrdtool-trac/wiki/RRDtool13">the RRDtool Wiki</a>.
 Get your copy from the <a href="http://oss.oetiker.ch/rrdtool/pub/beta">beta download area</a>.</p>
 
-<p>June 3-4 2008: <a href="http://www.nordicnagiosmeet.wmr.se/">Nordic Nagios Meet</a>. Tobi Oetiker will be giving a talk on RRDtool!<br/>
-<a href="http://www.nordicnagiosmeet.wmr.se/"><img border=0 src="newbanner250x60.gif"/></a></p>
-
 <H2>What RRDtool does</H2>
 
 <p>RRDtool is the OpenSource industry standard, high performance data
@@ -30,6 +27,11 @@ Python, Ruby, TCL or PHP bindings.</p>
 this site. It compiles on a number of different Linux and Unix platforms as
 well as on Microsoft Windows.</P>
 
+<H2>RRDtool Feeds</H2>
+
+<div>RRDtool Bugs feed <a href="http://feeds.feedburner.com/RRDtoolBugs" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0"/></a>&nbsp;<a href="http://feeds.feedburner.com/RRDtoolBugs" rel="alternate" type="application/rss+xml">subscribe in a reader</a></div>
+<div>RRDtool Wiki Updates <a href="http://feeds.feedburner.com/RRDtoolWikiUpdates" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0"/></a>&nbsp;<a href="http://feeds.feedburner.com/RRDtoolBugs" rel="alternate" type="application/rss+xml">subscribe in a reader</a></div>
+<div>RRDtool Checkins <a href="http://feeds.feedburner.com/RRDtoolCheckins" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0"/></a>&nbsp;<a href="http://feeds.feedburner.com/RRDtoolBugs" rel="alternate" type="application/rss+xml">subscribe in a reader</a></div>
 
 <H2>Sponsorship and Appreciators</H2>