sync with reality

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

diff --git a/website/bin/pod2wml.sh b/website/bin/pod2wml.sh
index 74bcc2cbcc3fb286d07fb783930ab792c9c86717..a122b5305a9479bd0bf7dd8393da5f7f2f07bebc 100755 (executable)
--- a/website/bin/pod2wml.sh
+++ b/website/bin/pod2wml.sh
@@ -2,16 +2,19 @@ pod2wml (){
  base=$1
  [ -z "$descr" ] && descr=$base
  [ -z "$menu" ] && menu=$descr
- pod2html --infile=$base.pod --outfile=$base.pre --noindex --htmlroot='$(ROOT)' --podroot=$SITEROOT --podpath=$PODPATH
- $SITEROOT/bin/fix-pod2html.pl $base.pre | $SITEROOT/bin/fix-hrefs.pl >$base.html
+ perl-5.8.8 -I/home/oetiker/checkouts/mrtg/trunk/web/bin/lib -MPod::Simple::HTML -e Pod::Simple::HTML::go $base.pod $base.html
+#Thing.pod Thing.html
+# pod2html-5.8.8 --infile=$base.pod --outfile=$base.pre --noindex --htmlroot='$(ROOT)' --podroot=$SITEROOT --podpath=$PODPATH
+# $SITEROOT/bin/fix-pod2html.pl $base.pre | $SITEROOT/bin/fix-hrefs.pl >$base.html
  echo "<nav:but ${sect}_$base      \"$menu\"           $base/>" >>navbar.inc
  printf "<dt><a href=\"$base.en.html\">" >>index.inc
- grep $base $base.pod |fgrep ' - '|head -1|sed 's| - |</a></dt><dd>|' >>index.inc 
+ grep -i $base $base.pod |fgrep ' - '|head -1|sed 's| - |</a></dt><dd>|' >>index.inc 
  echo "</dd>" >>index.inc
  echo "<page page=\"${sect}_$base\"" > $base.wml
- perl -0777 -n -e 's|E<lt>|<|g;s|E<gt>|>|g;m|=head1 AUTHO\S+\s*(.+)| && do {$a=$1;$e="no\@address.nowhere";$a=~ s/\s*<(.+?)>\s*,?// and $e=$1; $e=~ s/\s\S+\s/\@/;print "author=\"$a <$e>\"/>\n"}' $base.pod >>$base.wml
+ perl-5.8.8 -0777 -n -e 's|E<lt>|<|g;s|E<gt>|>|g;m|=head1 AUTHO\S+\s*(.+)| && do {$a=$1;$a =~ s/>.*/>/; $e="no\@address.nowhere";$a=~ s/\s*<(.+?)>\s*,?// and $e=$1; $e=~ s/\s\S+\s/\@/;print "author=\"$a <$e>\"/>\n"}' $base.pod >>$base.wml
  # perl -0777 -n -e 's|.*?(<h1.+)</body>.*|$1|s;for($i=5;$i>0;$i--){$j=$i-1;s|(</?h)$j>|$1$i>|g}; s|<h2><a name="name">NAME</a></h2>.*?<p>(.+?) - .*?</p>|<h1>$1</h1>|s;s|<p>\s*</p>||g;s|<hr.*?>||g;s|</pre>\s*<pre>|\n|g;s|<br\s*/>\s*</dt>|</dt>|g;s|</dd>\s*<dd>||g;print ' $base.html >>$base.wml
- perl -0777 -n -e '
+true <<'XXXX'
+ perl-5.8.8 -0777 -n -e '
   s|.*?(<h1.+)</body>.*|$1|s;
   for($i=5;$i>0;$i--){
          $j=$i-1;
@@ -19,20 +22,39 @@ pod2wml (){
   };
   s|<h2.*?>.*?NAME.*?</h2>.*?<p.*?>\s*(.+?)\s*- .*?</p>|<h1>$1</h1>|s;
   s{<li></li>(.+?)(?=<li>|</?ul>|</?ol>)}{<li>$1</li>}sg;
+  s|<dt><strong>\s*(.*?)</strong>\s*<dd>|<dt>$1</dt>\n<dd>|sg;
+  s|<dd>\s*<p>\s*(.*?)\s*</p>\s*</dd>|<dd>$1</dd>|sg;
+  s|<li>\s*<p>([^<]+?)</p>\s*</li>|<li>$1</li>|sg;
   s|<p>\s*</p>|\n|g;
   s|\n\s|\n|g;
   s|\s*</pre>\s*<pre>\s*|\n\n|g;
   s|(\S)</pre>|$1\n</pre>|g;
   s|<pre>(.+?)</pre>|<protect><pre>$1</pre></protect>|gs;
-  s|<strong>\s*(.+?)\s*</strong><br />\s+</dt>|$1</dt>\n|g;
-  s|<hr />\s*<h2>|<h2>|g;
+#  s|<strong>\s*(.+?)\s*</strong><br />\s+</dt>|$1</dt>\n|g;
+  s|<hr />\s*(<h\d>)|$1|g;
   s|<dd>\s*</dd>||gs;
   s|<a href=".*?/website|<a href="\$(ROOT)|g; 
   s|(<h2><a.*?>)\s*(\S)(.+?)\s*(</a></h2>)|$1$2\L$3\E$4|g;
   print 
  ' $base.html >>$base.wml
 # rm $base.html
- perl -i~ -0777 -p -e 's|</dd>\s*<pre(.*?)</pre>\s*<dd>|</dd><dd><pre$1</pre></dd><dd>|sg' $base.wml
- rm $base.html $base.pre
+ perl-5.8.8 -i~ -0777 -p -e 's|</dd>\s*<pre(.*?)</pre>\s*<dd>|</dd><dd><pre$1</pre></dd><dd>|sg' $base.wml
+XXXX
+ perl-5.8.8 -0777 -n -e '
+  s|</p>\s*<dt>|</p></dd>\n<dt>|sg;
+  s|</pre>\s*<dt>|</pre></dd>\n<dt>|sg;
+  s|<pre>(.+?)</pre>|<protect><pre>$1</pre></protect>|gs;
+  s|.*?(<h1.+)</body>.*|$1|s;
+  for($i=5;$i>0;$i--){
+         $j=$i-1;
+         s|(</?h)$j>|$1$i>|g
+  };
+  s|<h2.*?>.*?NAME.*?</h2>.*?<p.*?>\s*(.+?)\s*- .*?</p>|<h1>$1</h1>|s;
+
+  print 
+ ' $base.html >>$base.wml
+# rm $base.html
+ rm $base.html
+# $base.pre
  descr=""
 }

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 9c72936cf1b6e808e48141e0e97c5047d0847f22..66ac586561910af7853ccd93c65330925320eab8 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -9,6 +9,7 @@
 #include "stream-pop.xml"
 #include "n20e-daily.xml"
 #include "ups_voltage_month.xml"
+#include "temp-poprs.xml"
 #include "docsis_upstream_utilization.xml"
 #include "andrey.xml"
 #include "rrdtool-xmas.xml"

diff --git a/website/gallery/temp-poprs.png b/website/gallery/temp-poprs.png
new file mode 100644 (file)
index 0000000..23c6cb5
Binary files /dev/null and b/website/gallery/temp-poprs.png differ

diff --git a/website/gallery/temp-poprs.xml b/website/gallery/temp-poprs.xml
new file mode 100644 (file)
index 0000000..efd381e
--- /dev/null
+++ b/website/gallery/temp-poprs.xml
@@ -0,0 +1,16 @@
+<gallery image="temp-poprs..png" > <!-- no wider than 600 pixle -->
+
+      <title> Temperature </title>
+     <author> João Marcelo Ceron </author> 
+<description> This graph shows the temperature of a computer room (indoor) and make a parallel with external 
+temperature (in Porto Alegre city).</description>
+       <year> 2007 </year><month> 6 </month> <!-- creation date -->
+   <!-- Optional -->   
+
+   <livesite> http://www.pop-rs.rnp.br/temperatura </livesite> 
+      <email></email>
+
+</gallery>
+
+
+

diff --git a/website/inc/html.inc b/website/inc/html.inc
index afd62657ff4a02e72c5036d04c2e897c515dfd88..b289e80bf42c418abbb08065a2d9762f6a6b51e7 100644 (file)
--- a/website/inc/html.inc
+++ b/website/inc/html.inc
@@ -12,17 +12,17 @@ $x =~ s/\\n/ /g; print $x; :>:#H1_FLAT#}
 <div id="googlead_right">
 <script type="text/javascript"><!--
 google_ad_client = "pub-8135238818549668";
-google_ad_width = 160; 
-google_ad_height = 600;
-google_ad_format = "160x600_as";
+google_ad_width = 300; 
+google_ad_height = 250;
+google_ad_format = "300x250_as";
 google_ad_type = "text_image";
 google_ad_channel ="5627785043";
-google_color_border = "e6e6e6";      
-google_color_bg = "f8f8f8";
+google_color_border = "ffffff";      
+google_color_bg = "ffffff";
 google_color_link = "0017C1"; 
-google_color_url = "270B83"; 
+google_color_url = "000000"; 
 google_color_text = "000000";
-#google_color_border = "717fe5";
+#google_color_border = "ffffff";
 #google_color_bg = "F0F0F0";
 #google_color_link = "2c3fbf";
 #google_color_url = "6851b0";
@@ -44,23 +44,24 @@ s/\\n/ /g; print :>:#Title#}
 </define-tag>
 
 <perl>my $addcount=0;</perl>
+
 <define-tag h2 whitespace=delete endtag=required>
 <perl>
 $addcount++;
-if ($addcount == 6){
+if ($addcount == 7){
 print <<'GOOGLEAD';
 <p>
 <script type="text/javascript"><!--
 google_ad_client = "pub-8135238818549668";
-google_ad_width = 336;
-google_ad_height = 280;
-google_ad_format = "336x280_as";
+google_ad_width = 300;
+google_ad_height = 250;
+google_ad_format = "300x250_as";
 google_ad_type = "text_image";
 google_ad_channel ="9159032853";
-google_color_border = "E6E6E6";
-google_color_bg = "f8f8f8";
+google_color_border = "ffffff";
+google_color_bg = "ffffff";
 google_color_link = "2c3fbf";
-google_color_url = "6851b0";
+google_color_url = "000000";
 google_color_text = "000000";
 //--></script>
 <script type="text/javascript"
@@ -72,3 +73,32 @@ GOOGLEAD
 </perl>
 <h2* %attributes>%body</h2*>
 </define-tag>
+
+<define-tag h3 whitespace=delete endtag=required>
+<perl>
+$addcount++;
+if ($addcount == 7){
+print <<'GOOGLEAD';
+<p>
+<script type="text/javascript"><!--
+google_ad_client = "pub-8135238818549668";
+google_ad_width = 300;
+google_ad_height = 250;
+google_ad_format = "300x250_as";
+google_ad_type = "text_image";
+google_ad_channel ="9159032853";
+google_color_border = "ffffff";
+google_color_bg = "ffffff";
+google_color_link = "2c3fbf";
+google_color_url = "000000";
+google_color_text = "000000";
+//--></script>
+<script type="text/javascript"
+  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
+</p>
+GOOGLEAD
+}
+</perl>
+<h3* %attributes>%body</h3*>
+</define-tag>

diff --git a/website/inc/template.inc b/website/inc/template.inc
index 67ef63f916a76a6591c72abb379907c60c614acc..ea7882da86efb504d5f9938a7a4140a8c36a2e8f 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -105,7 +105,7 @@ RRDtool
 <perl>
 if ( -s "$(WML_SRC_BASENAME).wml" > 4000 ){
 print <<'GOOGLEAD';
-<div align="right" style="clear:right">
+<div style="clear:right">
 <script type="text/javascript"><!--
 google_ad_client = "pub-8135238818549668";
 google_ad_width = 300;
@@ -113,10 +113,10 @@ google_ad_height = 250;
 google_ad_format = "300x250_as";
 google_ad_type = "text_image";
 google_ad_channel ="6085696737";
-google_color_border = "E6E6E6";
-google_color_bg = "f8f8f8";
+google_color_border = "ffffff";
+google_color_bg = "ffffff";
 google_color_link = "2c3fbf";
-google_color_url = "6851b0";
+google_color_url = "000000";
 google_color_text = "000000";
 //--></script>
 <script type="text/javascript"

diff --git a/website/index.wml b/website/index.wml
index 858a956426c9ab152ec139efe6438c06cb52dc62..63bec32808a69508d19f88905c6cab232835197c 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -4,7 +4,12 @@
 
 <H1>About RRDtool</H1>
 
-<div style="float:right"><a style="border-width: 0px" href="http://www.oetiker.ch/press"><img src="award-white.png" border="0"/></a></div>
+#<div style="float:right"><a style="border-width: 0px" href="http://www.oetiker.ch/press"><img src="award-white.png" border="0"/></a></div>
+
+<H2>News</H2>
+
+Read about RRDtool 1.3 development on the 
+<a href="http://oss.oetiker.ch/rrdtool-trac/wiki/RRDtool13">RRDtool Wiki</a>.
 
 <H2>Logging &amp; Graphing</H2>
 
@@ -12,8 +17,6 @@
 Use it to write your custom monitoring shell scripts or create whole
 applications using its Perl, Python or PHP bindings. Create graphs like this:</p>
 
-<p><img src="btdmd8.png"/></p>
-
 <P>RRD is the acronym for Round Robin Database. It is a system to store and
 display time-series data (i.e. network bandwidth, machine-room temperature,
 server load average).</P>
@@ -24,10 +27,7 @@ server load average).</P>
 this site. It compiles on a number of different Linux and Unix platforms as
 well as on Microsoft Windows.</P>
 
-<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>
+<p><img src="btdmd8.png"/></p>
 
 <H2>Sponsorship and Appreciators</H2>
 

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 03d4d9b441a6f3d5278ed43b07001483602a41b4..9b32260ed40984a9cb35fb4702b0e0fd15f645b3 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -13,9 +13,11 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "dsreport.xml"
 #include "rrd_merger.xml"
 #include "weathermap4rrd.xml"  
+#include "weathermap_rrdworld.xml"
 #include "rrdutils.xml"
 #include "rrd4j.xml"
-# #include "toolsmith.xml"
+#include "toolsmith.xml"
+#include "rrdcreator.xml"
 
 <h2>Free Applications</h2>
 

diff --git a/website/rrdworld/rrdcreator.xml b/website/rrdworld/rrdcreator.xml
new file mode 100644 (file)
index 0000000..2f505db
--- /dev/null
+++ b/website/rrdworld/rrdcreator.xml
@@ -0,0 +1,13 @@
+<rrdworld type="companion" >
+  <name> RRDTool::Creator</name>
+  <author>Jacquelin Charbonnel</author>
+  <description>
+    Perl module to simplify the creation of different kind of common RRD
+  </description>
+  <homepage>
+    http://search.cpan.org/search?query=RRDTool::Creator&amp;mode=module
+  </homepage>
+  <year> 2007 </year>
+  <month> 6 </month>
+  <license> CeCILL-C </license>
+</rrdworld>

diff --git a/website/rrdworld/weathermap_rrdworld.xml b/website/rrdworld/weathermap_rrdworld.xml
new file mode 100644 (file)
index 0000000..760c531
--- /dev/null
+++ b/website/rrdworld/weathermap_rrdworld.xml
@@ -0,0 +1,12 @@
+<rrdworld type="companion"
+          icon="weathermap_rrdworld.png" > <!-- Size 100x66 --> 
+       <name>PHP Network Weathermap</name>
+     <author>Howard Jones</author>
+<description>Weathermap is a network visualisation tool, to take data you already have and show you an overview of your network in map form. Support is built in for RRD, and tab-delimited text files. Other sources are via plugins or external scripts. Includes nice Cacti integration with user authentication.</description>
+   <homepage>http://www.network-weathermap.com/</homepage> 
+       <year>2007 </year><month> 6 </month> <!-- Entry creation date -->
+    <license>GPL </license>
+
+   <livesite>http://www.network-weathermap.com/manual/0.92/example/example.html</livesite> 
+      <email>howie@thingy.com</email> <!-- Author contact -->
+</rrdworld>
\ No newline at end of file