added more bits

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

diff --git a/website/award-white.png b/website/award-white.png
new file mode 100644 (file)
index 0000000..40d0b24
Binary files /dev/null and b/website/award-white.png differ

diff --git a/website/bin/pod2wml.classic.sh b/website/bin/pod2wml.classic.sh
new file mode 100755 (executable)
index 0000000..e94c673
--- /dev/null
+++ b/website/bin/pod2wml.classic.sh
@@ -0,0 +1,39 @@
+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
+ 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 
+ 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 -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 '
+  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;
+  s{<li></li>(.+?)(?=<li>|</?ul>|</?ol>)}{<li>$1</li>}sg;
+  s|<dt><strong>\s*(.+?)</strong>\s*<dd>|<dt>$1</dt>\n<dd>|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|<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
+ descr=""
+}

diff --git a/website/forum.wml b/website/forum.wml
new file mode 100644 (file)
index 0000000..d10614e
--- /dev/null
+++ b/website/forum.wml
@@ -0,0 +1,5 @@
+<PAGE AUTHOR = "Tobias Oetiker <tobi@oetiker.ch>"
+        PAGE = "forum">
+       
+<a id="nabblelink" href="http://n2.nabble.com/RRD-Mailinglists-f937164.html">RRD Mailinglists</a>
+<script src="http://n2.nabble.com/embed/f937164"></script>

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index e38da075cbff2a2bab9a678845ef9f24b4cd79a2..465bf979786a0cee72c5828d2c0ca0b3e8f87a45 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -89,7 +89,7 @@
 <p><a href="../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
 <br />
-<div><a href="http://tobi.oetiker.ch/wish/"><img border="0" alt="Make Tobi Happy" src="../inc/happy-tobi.png" width="119" height="72" /></a></div>
+<div><a href="http://tobi.oetiker.ch/wish/"><img border="0" alt="Make Tobi Happy" src="../inc/happy-tobi.png" /></a></div>
 <br />
 <br />
 <div><iframe width="120" height="50" name="bandwidth" frameborder="0" src="../hoster.html" id="bandwidth"></iframe></div>
@@ -102,7 +102,6 @@
 <td id="bodycell">
 <div id="mirrors"><a href="http://oss.oetiker.ch/rrdtool/gallery/index.en.html">Swiss Original</a>.&nbsp;Mirrors: <a href="http://rrdtool.mirror.graemef.net/gallery/index.en.html">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
 <a href="http://rrdtool.cs.pu.edu.tw/gallery/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
-<a href="http://ftp.heanet.ie/mirrors/oss.oetiker.ch/rrdtool/gallery/index.en.html">IE</a><!-- <mirrors@heanet.ie>-->
 <a href="http://rrdtool.codemonkey.se/gallery/index.en.html">SE</a><!--Hans Engren <hans@cyclone.se>-->
 <a href="http://rrdtool.basemirror.de/gallery/index.en.html">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
 <a href="http://rrdtool.mirroraty.org/gallery/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
@@ -441,7 +440,7 @@ creation date -->
 <td id="footcell"><!-- ############################# -->
 <!-- # FOOTER -->
 <!-- ############################# -->
-<div id="address"><small>08/09/08 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a></small></div>
+<div id="address"><small>09/07/08 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a></small></div>
 </td>
 </tr>
 </table>

diff --git a/website/inc/favicon.ico b/website/inc/favicon.ico
new file mode 100644 (file)
index 0000000..7d08dd4
Binary files /dev/null and b/website/inc/favicon.ico differ

diff --git a/website/inc/happy-tobi.png b/website/inc/happy-tobi.png
new file mode 100644 (file)
index 0000000..a0984cd
Binary files /dev/null and b/website/inc/happy-tobi.png differ

diff --git a/website/inc/rrdtool-gold.png b/website/inc/rrdtool-gold.png
new file mode 100644 (file)
index 0000000..e60eacc
Binary files /dev/null and b/website/inc/rrdtool-gold.png differ

diff --git a/website/inc/template.inc b/website/inc/template.inc
index 829efe2fe20da70f6ae0a98db07f2764d96ba7e2..e8e35b35b38f516aaa93d41998cc3ee69b5feeb9 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -104,7 +104,7 @@
 <div id="mirrors">
 <A HREF="http://oss.oetiker.ch/rrdtool/<where/>">Swiss Original</A>.&nbsp;Mirrors: 
 <A HREF="http://rrdtool.mirror.graemef.net/<where/>">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
-##<A HREF="http://rrdtool.planetmirror.com/<where/>">AU</A><!--jason andrade <jason@dstc.edu.au>-->
+#<A HREF="http://rrdtool.planetmirror.com/<where/>">AU</A><!--jason andrade <jason@dstc.edu.au>-->
 <A HREF="http://rrdtool.cs.pu.edu.tw/<where/>">TW</A><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
 #<A HREF="http://ftp.heanet.ie/mirrors/oss.oetiker.ch/rrdtool/<where/>">IE</A><!-- <mirrors@heanet.ie>-->
 <A HREF="http://rrdtool.codemonkey.se/<where/>">SE</A><!--Hans Engren <hans@cyclone.se>-->

diff --git a/website/oscon-120x60.gif b/website/oscon-120x60.gif
new file mode 100644 (file)
index 0000000..1d617bf
Binary files /dev/null and b/website/oscon-120x60.gif differ

diff --git a/website/stream-pop.png b/website/stream-pop.png
new file mode 100644 (file)
index 0000000..02a2f7c
Binary files /dev/null and b/website/stream-pop.png differ