improve html generation

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1486 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/website/bin/pod2wml.sh b/website/bin/pod2wml.sh
index 8055b3e6b05d0e0f1f8ef66f62675d7ad9ff8f04..b2669f873291b262a923b5a8c02a76c6104aff5b 100755 (executable)
--- a/website/bin/pod2wml.sh
+++ b/website/bin/pod2wml.sh
@@ -49,9 +49,9 @@ XXXX
          $j=$i-1;
          s|(</?h)$j>|$1$i>|g
   };
-  s|http://search.cpan.org/perldoc\?([^ #."]+)|$1.en.html|g;
+  s|http://search.cpan.org/perldoc\?([^ #."]+)|$1.en.html|g;  
+  s|rrdtutorial.en.html|../tut/rrdtutorial.en.html|g;
   s|<h2.*?>.*?NAME.*?</h2>.*?<p.*?>\s*(.+?)\s*- .*?</p>|<h1>$1</h1>|s;
-
   print 
  ' $base.html >>$base.wml
 # rm $base.html

diff --git a/website/inc/template.inc b/website/inc/template.inc
index 824623b434479a99f62255c9671ade5d0364ec69..08a711877907e1dfe60e2101cbf20f0c17441966 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -79,7 +79,7 @@
 <br/>
 <br/>
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.groundworkopensource.com/products/components/rrdtool.html"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/gw200x100.gif"/></a></p>
+<p><a href="http://www.loopfuse.net/webrecorder/kredirect?kid=3&cid=LF_00c56f70"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/gw200x100.gif"/></a></p>
 <p><a href="http://www.zenoss.com/rrdtool?utm_source=rrdtool&amp;utm_medium=logolink&amp;utm_campaign=inbound"><img border="0" title="Zenoss Open Source IT Monitoring" alt="Zenoss Open Source IT Monitoring" src="$(ROOT)/logos/zenoss.png"/></a></p>
 <p><a href="$(ROOT)/sponsor.<lang:star: */>.html">Silver Sponsors ...</a></p>
 <br/>

diff --git a/website/index.wml b/website/index.wml
index 52b198bfabd7a6cf669808ea5780a4c8160f58f8..2f8627a8852287c0e9f48d9edbe592ce0f85af83 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -13,11 +13,13 @@ logging and graphing system for time series data. Use it to write your
 custom monitoring shell scripts or create whole applications using its Perl,
 Python, Ruby, TCL or PHP bindings.</p>
 
-<H2>Version 1.3.0 Released</H2>
+<H2>Version 1.3.2 Released</H2>
 
-<p>RRDtool 1.3.0 is releasedead. Read all about the new features in 
+<p>All users of 1.3.x versions should upgrade since it contains a major bugfix for a data <a href="http://oss.oetiker.ch/rrdtool-trac/ticket/178">corruption bug</a> triggerd by running rrdtool update with multiple values.</p>
+
+<p>Read all about the new features of the 1.3 series in
 <a href="http://oss.oetiker.ch/rrdtool-trac/wiki/RRDtool13">the RRDtool Wiki</a>.</p>
-#<p><img src="stream-pop.png"/></p>
+
 
 <H2>Download</H2>
 
@@ -36,3 +38,5 @@ well as on Microsoft Windows.</P>
 <P>You like RRDtool? You want show your appreciation? You want to sponsor
 future development or a particular new feature? Check out our <A
 HREF="sponsor.en.html">Sponsorship and Appreciation</a> page or visit my <a href="http://tobi.oetiker.ch/wish">wish list</a>.</P>
+
+<p><img src="stream-pop.png"/></p>

diff --git a/website/prog/build.sh b/website/prog/build.sh
index 6ab2f7fb915e7e279601afce95a099fde17ed2a6..79ebd7d5ec9daabf1370344f36ada894be8beff4 100755 (executable)
--- a/website/prog/build.sh
+++ b/website/prog/build.sh
@@ -14,7 +14,7 @@ pod2descr() {
 rm -f navbar.inc
 rm -f index.inc
 
-for pod in `cd $src/doc/;ls *.pod|egrep 'RRD|thread|python|ruby'`; do
+for pod in `cd $src/doc/;ls *.pod|egrep '(RRD|thread|python|ruby)'`; do
  base=`echo $pod |sed 's,.pod,,'` 
  echo $base
  cat  $src/doc/$pod > $base.pod

diff --git a/website/rrdworld/gbrrdgraphix.xml b/website/rrdworld/gbrrdgraphix.xml
new file mode 100644 (file)
index 0000000..bcce027
--- /dev/null
+++ b/website/rrdworld/gbrrdgraphix.xml
@@ -0,0 +1,15 @@
+<rrdworld type="application"
+          icon="rumble.png" > <!-- Size 100x66 -->
+ 
+       <name> gbRRDGraphix </name>
+     <author> Olivier CRUILLES </author>
+<description> gbRRDGraphix is a graphical interface specialy to learn or use 'rrdtool' utilities easily </description>
+   <homepage> http://gbrrdgraphix.sourceforge.net </homepage> 
+       <year> 2008 </year><month> 9 </month> <!-- Entry creation date -->
+    <license> GPL v2 </license>
+
+   <!-- Optional -->   
+
+      <email> linuxos@club-internet.fr </email> <!-- Author contact -->
+
+</rrdworld>

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 467c4e8cabc0f53d63367118be68fcda2b279fda..321eff46e5bcdf1c655ac3870f22bc631a3bfe5e 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -28,12 +28,13 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "bigsis_rrdworld.xml"
 #include "cacti.xml"
 #include "collectd.xml"
-#include "eluna_graph_system.xml"
 #include "efw-community.xml"
+#include "eluna_graph_system.xml"
+#include "gbrrdgraphix.xml"
 #include "mailgraph.xml"
 #include "monitorix.xml"
-#include "munin.xml"
 #include "mpltd.xml"
+#include "munin.xml"
 #include "n2rrd.xml"
 #include "netmrg.xml"
 #include "nmis-rrdtool.xml"
@@ -48,11 +49,11 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "rrdstats.xml"
 #include "rrdutil.xml"
 #include "rrdweather.xml"
+#include "serverstats.xml"
 #include "sicm.xml"
-#include "snmpgraph.xml"
-#include "snm_at_rrdworld.xml"
 #include "smokeping.xml"
-#include "serverstats.xml"
+#include "snm_at_rrdworld.xml"
+#include "snmpgraph.xml"
 #include "statsdawg.xml"
 #include "systemgraph.xml"
 #include "thermometer.xml"
@@ -60,8 +61,8 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "toolsmith.xml"
 #include "torrus.xml"
 #include "tstat.xml"
-#include "webminstats.xml"
 #include "unnoc.xml"
+#include "webminstats.xml"
 #include "zenoss.xml"
 
 <h2>Commercial Applications</h2>