minor fixed to the web code

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

diff --git a/website/bin/fix-hrefs.pl b/website/bin/fix-hrefs.pl
index 17160b37980617e7e11eb9ef07e7afb326bb56cd..4b6701b79159c01f4c9867b34b1fdb97c5ad85db 100755 (executable)
--- a/website/bin/fix-hrefs.pl
+++ b/website/bin/fix-hrefs.pl
@@ -14,8 +14,9 @@ sub startsub {
         my $text = shift;
         
        if ($tag eq "a") {
-               $text =~ s,/home/oetiker/data/svn-checkout/rrdtool/branches/1.2/website/doc/,,;
+               $text =~ s,".*?/doc/,",;
                $text =~ /^http:/ || $text =~ s,\.html,.en.html,;
+               $text =~ s/name=".+?"//;
        }
        print $text;
 }

diff --git a/website/bin/htmlfix.sh b/website/bin/htmlfix.sh
index 9437245e35979e2a0da13e0b9de0b9a6e267c59c..bca2bec321ae65a182c4fe59acecb64ecef38ace 100755 (executable)
--- a/website/bin/htmlfix.sh
+++ b/website/bin/htmlfix.sh
@@ -2,10 +2,11 @@
 case $1 in
 *.html)
    tidy -latin1 -wrap 0 -q -asxhtml $1  >$1.fixed  2>$1.report
+   TIDY_RET=$?
    perl -i -0777 -p -e 's/^\s*//;s{="mailto:(oetiker|tobi|tobias)@(oetiker.ch|ee.ethz.ch)"}{="http://tobi.oetiker.ch/"}g;s{="mailto:(\S*?)\@(\S*?)"}{="mailto:$1@..delete..this..$2"}g' $1.fixed
    # yes, beleive it or not IE chockes on propper xhtml pages ... sigh
    perl -i -0777 -p -e 's/^\s*<\?xml.+?\?>\s*//;'  $1.fixed
-   if [ $? != 0 ]; then
+   if [ $TIDY_RET != 0 ]; then
         echo Parsing: $1
         egrep -v "^(HTML Tidy|$1:|To learn|Please send|HTML and CSS|Lobby your)" $1.report
         rm $1.report

diff --git a/website/download.wml b/website/download.wml
index 6ab627a3c8cd86655d86151a3122b269b9c7fccc..d0d788b6bfc61ee57be0e33d5ca5400025b42e26 100644 (file)
--- a/website/download.wml
+++ b/website/download.wml
@@ -8,8 +8,8 @@ You can download RRD tool from several places:
 <H2>Primary Distribution Point</H2>
 
 <UL>
- <LI><A HREF="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/?M=D">Stable Release</A></LI>
- <LI><A HREF="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/beta/?M=D">Development SnapShots</A></LI>
+ <LI><A HREF="http://oss.oetiker.ch/rrdtool/pub/?M=D">Stable Release</A></LI>
+ <LI><A HREF="http://oss.oetiker.ch/rrdtool/pub/beta/?M=D">Development SnapShots</A></LI>
 </UL>
 
 <p>You might want to read the <a href="doc/rrdbuild.en.html">build instructions</a> for inspiration on where to go after downloading the source.</p>
@@ -17,50 +17,29 @@ You can download RRD tool from several places:
 <H2>Mirror Sites</H2>
 
 <UL>
-##  <LI>SE <A HREF="http://ftp.sunet.se/pub/network/monitoring/rrdtool/">http://ftp.sunet.se/pub/network/monitoring/rrdtool/</A> (Johan.Hofvander@sdi.slu.se)</LI>
-  <LI>SI <A HREF="http://www.fastmirrors.org/rrdtool/">http://www.fastmirrors.org/rrdtool/</A> (Tomy Kurtis webadmin [at] fastmirrors.org)</LI>
-##  <LI>FR <A HREF="ftp://ftp.fastorama.com/mirrors/rrdtool/">ftp://ftp.fastorama.com/mirrors/rddtool</A> (MrJacK mrjack@fastorama.com)</LI>
-##  <LI>US <A HREF="ftp://ftp.exobit.org/pub/monitoring/rrdtool/">ftp://ftp.exobit.org/pub/monitoring/rrdtool</A> (Jeffrey Meltzer jeffrey@exobit.org)</LI>
-
-  <LI>CA <A HREF="ftp://ftp.nrc.ca/pub/packages/snmp/rrdtool">ftp://ftp.nrc.ca/pub/packages/snmp/rrdtool</A> ( William F. Maton Sotomayor wmaton@ryouko.imsb.nrc.ca)</LI>
-##  <LI>AU <A HREF="ftp://ftp.mirrors.wiretapped.net/pub/rrdtool/">ftp://ftp.mirrors.wiretapped.net/pub/rrdtool/</A> (Grant Bayley gbayley [at] ausmac.net)</LI>
-  <LI>AU <A HREF="http://the.wiretapped.net/security/network-monitoring/rrdtool/">http://www.mirrors.wiretapped.net/security/network-monitoring/rrdtool/</A> (Grant Bayley gbayley [at] ausmac.net)</LI>
-  <LI>GR <A HREF="http://ftp.ntua.gr/pub/net/monitoring/rrdtool/">http://ftp.ntua.gr/pub/net/monitoring/rrdtool/</A> (Panagiotis Christias P.Christias@noc.ntua.gr)</LI>
-  <LI>GR <A HREF="ftp://ftp.ntua.gr/pub/net/monitoring/rrdtool/">ftp://ftp.ntua.gr/pub/net/monitoring/rrdtool/</A> (Panagiotis Christias P.Christias@noc.ntua.gr)</LI>
-##  <LI>BE <A HREF="ftp://ftp.grmbl.com/pub/webtools/rrdtool/">ftp://ftp.grmbl.com/pub/webtools/rrdtool/</A> (Bram Dumolin bram@grmbl.be)</LI>
-  <LI>IE <A HREF="ftp://ftp.heanet.ie/mirrors/people.ee.ethz.ch/%257Eoetiker/webtools/rrdtool/pub/">(http,ftp,rsync)://ftp.heanet.ie/mirrors/people.ee.ethz.ch/%257Eoetiker/webtools/rrdtool/pub</A> (Colm MacCárthaigh colm.maccarthaigh@heanet.ie)</LI>
   <LI>BR <A HREF="ftp://ftp.pucpr.br/rrdtool/">ftp://ftp.pucpr.br/rrdtool/</A>. (Rafael Gustavo Gassner rafael.gassner@pucpr.br)</LI>
-  <LI>RO <A HREF="ftp://ftp.iasi.roedu.net/pub/mirrors/people.ee.ethz.ch/%257Eoetiker/webtools/rrdtool/pub/">ftp://ftp.iasi.roedu.net/pub/mirrors/people.ee.ethz.ch/%257Eoetiker/webtools/rrdtool/pub/</A>. (RoEduNet Iasi Branch ftpadmin@iasi.roedu.net)</LI>
-  <LI>RO <A HREF="http://ftp.idilis.ro/mirrors/rrdtool/">http://ftp.idilis.ro/mirrors/rrdtool/</A> (Dragos Nitu mirrors@idilis.net)</LI>
-  <LI>TR <A HREF="http://godel.cs.bilgi.edu.tr/mirror/rrdtool/">http://godel.cs.bilgi.edu.tr/mirror/rrdtool/</A> (Can Burak Cilingir canburak@cs.bilgi.edu.tr)</LI>
+  <LI>CA <A HREF="ftp://ftp.nrc.ca/pub/packages/snmp/rrdtool">ftp://ftp.nrc.ca/pub/packages/snmp/rrdtool</A> ( William F. Maton Sotomayor wmaton@ryouko.imsb.nrc.ca)</LI>
+  <LI>FR <A HREF="ftp://ftp.fastorama.com/mirrors/rrdtool/">ftp://ftp.fastorama.com/mirrors/rddtool</A> (MrJacK mrjack@fastorama.com)</LI>
   <LI>NL <A HREF="ftp://ftp.bit.nl/mirror/rrdtool/">ftp://ftp.bit.nl/mirror/rrdtool/</A> (BIT, The Netherlands mirror@bit.nl)</LI>
-  <LI>US <A HREF="ftp://ftp.subterrain.net/pub/rrdtool/">ftp://ftp.subterrain.net/pub/rrdtool/</a> (Justin Lundy subterrain.net)</LI>
-  <LI>US <A HREF="http://www.subterrain.net/tools/visualization/rrdtool/">http://www.subterrain.net/tools/visualization/rrdtool/</a> (Justin Lundy subterrain.net)</LI>
-  <LI>CR <A HREF="http://rrdtool.hostarica.com">http://rrdtool.hostarica.com</a> ( Jorge Guntanis jorge@hostarica.com )</LI>
-##  <LI>NL <A HREF="ftp://ftp.cbn.net.id/mirror/rrdtool/">ftp://ftp.cbn.net.id/mirror/rrdtool/</A> (Achmad Yahya Sjarifuddin yahya@cbn.net.id)</LI>
+  <LI>RO <A HREF="http://ftp.idilis.ro/mirrors/rrdtool/">http://ftp.idilis.ro/mirrors/rrdtool/</A> (Dragos Nitu mirrors@idilis.net)</LI>
+  <LI>SE <A HREF="ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/">ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/</A> (Johan.Hofvander@sdi.slu.se)</LI>
+  <LI>SI <A HREF="http://www.fastmirrors.org/rrdtool/">http://www.fastmirrors.org/rrdtool/</A> (Tomy Kurtis webadmin [at] fastmirrors.org)</LI>
 </UL>
 
 <H2>Binary Distributions</H2>
 
 <UL>
-    <LI>AIX by <A HREF="mailto:zoran.majcenic_inet.hr">Zoran Majcenic</A> -- <A HREF="http://www.inet.hr/zmp/ibm/rrdtool">http://www.inet.hr/zmp/ibm/rrdtool</A></LI>
-##  <LI>FreeBSD Package by <A HREF="mailto:Jarrod.Sayers_netlead.com.au">Jarrod Sayers</A> -- <A HREF="http://people.netlead.com.au/~jarrod/rrdtool/">http://people.netlead.com.au/~jarrod/rrdtool/</A></LI> -->
-##  <LI>Linux x86 RPM by <A HREF="mailto:hgomez_users.sourceforge.net">Henri Gomez</A> -- <A HREF="http://ftp.falsehope.com/home/gomez/">http://ftp.falsehope.com/home/gomez/</A></LI>
-##  <LI>Linux x86 RPM by <A HREF="mailto:rtfman_eircom.net">John</A> -- <A HREF="http://homepage.eircom.net/~rtfman/download/downloadLinux.html">http://homepage.eircom.net/~rtfman/download/downloadLinux.html</A></LI>
-##  <LI>Linux RH 7.2 x86 RPM by <A HREF="mailto:austin_digitalroadkill.net">Austin Gonyou</A> -- <A HREF="http://www.digitalroadkill.net/public/rrdtool">http://www.digitalroadkill.net/public/rrdtool</A></LI>
-##  <LI>Mac OS X by <A HREF="mailto:mgalvin001_netscape.net">Matt T. Galvin</A> -- <A HREF="pub/">local</A></LI>
-  <LI>Solaris 8/9 SPARC/X86 <A HREF="mailto:ihsan_blastwave.org">Ihsan Dogan</A> -- <A HREF="http://www.blastwave.org/packages.php/rrdtool">http://www.blastwave.org/packages.php/rrdtool</A></LI>
-##  <LI>Solaris 7 x86 <A HREF="mailto:rtfman_eircom.net">John</A> -- <A HREF="http://homepage.eircom.net/~rtfman/download/downloadx86.html">http://homepage.eircom.net/~rtfman/download/downloadx86.html</A></LI>
-  <LI>Debian Linux <A HREF="http://packages.debian.org/rrdtool">http://packages.debian.org/rrdtool</A></LI>
-#  <LI>Native Windows <A HREF="pub/?M=D">http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/</a></LI>
-  <LI>Native Windows <A HREF="http://www.gknw.net/mirror/rrdtool/">http://www.gknw.net/mirror/rrdtool/</a></LI>
-  <LI>Cygwin Windows <A HREF="http://www.cacti.net/downloads/rrdtool/win32">http://www.cacti.net/downloads/rrdtool/win32/</a></LI>
-  <LI>Fink OSX <A  HREF="http://pdb.finkproject.org/pdb/package.php/rrdtool">http://pdb.finkproject.org/pdb/package.php/rrdtool</a></li>
+ <LI>AIX by <A HREF="mailto:zoran.majcenic_inet.hr">Zoran Majcenic</A> -- <A HREF="http://www.inet.hr/zmp/ibm/rrdtool">http://www.inet.hr/zmp/ibm/rrdtool</A></LI>
+ <LI>Debian Linux <A HREF="http://packages.debian.org/rrdtool">http://packages.debian.org/rrdtool</A></LI>
+ <LI>Redhat/Fedora <A href="http://dag.wieers.com/packages/rrdtool/">http://dag.wieers.com/packages/rrdtool/</a></li>
+ <LI>Native Windows 1 <A HREF="pub/?M=D">http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/</a></LI>
+ <LI>Native Windows 2 <A HREF="http://www.gknw.net/mirror/rrdtool/">http://www.gknw.net/mirror/rrdtool/</a></LI>
+ <LI>NetWare <A HREF="http://www.gknw.net/mirror/rrdtool/">http://www.gknw.net/mirror/rrdtool/</a></LI>
+ <LI>Cygwin Windows <A HREF="http://www.cacti.net/downloads/rrdtool/win32">http://www.cacti.net/downloads/rrdtool/win32/</a></LI>
 </UL>
 
 <H2>Anonymous SVN for RRDtool</H2>
 
-
 <p>RRDtool source is stored in a subversion repository with anonymous access.</p>
 
 <p>Browse the RRDtool SVN via <a href="http://oss.oetiker.ch/rrdtool-trac/browser/branches/1.2/program">RRDtrac</a>.

diff --git a/website/inc/html.inc b/website/inc/html.inc
index afffb002ea84d4e17b3501f1c425a67716cb9b99..5a82ecce5098abaaea3b326c8401f0a04c4fa1af 100644 (file)
--- a/website/inc/html.inc
+++ b/website/inc/html.inc
@@ -17,8 +17,8 @@ google_ad_height = 600;
 google_ad_format = "160x600_as";
 google_ad_type = "text_image";
 google_ad_channel ="5627785043";
-google_color_border = "ffffff";      
-google_color_bg = "ffffff";
+google_color_border = "e6e6e6";      
+google_color_bg = "f8f8f8";
 google_color_link = "0017C1"; 
 google_color_url = "270B83"; 
 google_color_text = "000000";
@@ -42,3 +42,33 @@ google_color_text = "000000";
 kjhasdflkjhasdf
 s/\\n/ /g; print :>:#Title#}
 </define-tag>
+
+<perl>my $addcount=0;</perl>
+<define-tag h2 whitespace=delete endtag=required>
+<perl>
+$addcount++;
+if ($addcount == 6){
+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_type = "text_image";
+google_ad_channel ="9159032853";
+google_color_border = "E6E6E6";
+google_color_bg = "f8f8f8";
+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">
+</script>
+</p>
+GOOGLEAD
+}
+</perl>
+<h2*>%body</h2*>
+</define-tag>

diff --git a/website/inc/template.inc b/website/inc/template.inc
index f78ff5811991db51c77b870fddb4bb653872da16..bf074671bf121e1cc054e155a2ed1ab331b392ae 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -82,7 +82,9 @@ RRDtool
 <!-- # BODY -->
 <!-- ############################# -->
 <div id="body">
+<!-- google_ad_section_start -->
 {#Body#}
+<!-- google_ad_section_end -->
 </div>
 </td>
 </tr>
@@ -92,6 +94,30 @@ RRDtool
 <!-- ############################# -->
 <!-- # FOOTER -->
 <!-- ############################# -->
+<perl>
+if ( -s "$(WML_SRC_BASENAME).wml" > 4000 ){
+print <<'GOOGLEAD';
+<div align="right" style="clear:right">
+<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 ="6085696737";
+google_color_border = "E6E6E6";
+google_color_bg = "f8f8f8";
+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">
+</script>
+</div>
+GOOGLEAD
+}
+</perl>
 <div id="address">
 <small>
 <perl>
@@ -114,30 +140,6 @@ LINE
 </perl>
 </small>
 </div>
-<perl>
-if ( -s "$(WML_SRC_BASENAME).en.html" > 15000 ) {
-print <<'GOOGLEAD';
-<p>
-<script type="text/javascript"><!--
-google_ad_client = "pub-8135238818549668";
-google_ad_width = 728;
-google_ad_height = 90;
-google_ad_format = "728x90_as";
-google_ad_type = "text_image";
-google_ad_channel ="6085696737";
-google_color_border = "ffffff";
-google_color_bg = "ffffff";     
-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">
-</script>
-</p>
-GOOGLEAD
-}
-</perl>
 </td></tr>
 </table>
 <hr class="legacy"/>

diff --git a/website/navbar.inc b/website/navbar.inc
index 1ff88fc9fccdfbac4f6e898ac44ea9cb4c20db32..2b0092b087c442c9341a659702ac8e4f164b42b6 100644 (file)
--- a/website/navbar.inc
+++ b/website/navbar.inc
@@ -9,7 +9,7 @@
  <nav:but gallery        "Gallery"                 gallery/index                        />
  <nav:but rrdworld       "RRDworld"                rrdworld/index                />
  <nav:but prog           "Programming"             prog/index          prog      />
- <nav:but rrdtrac        "RRDtrac"                 http://people.ee.ethz.ch/oetiker/webtools/rrdtool-trac/   />
+ <nav:but rrdtrac        "RRDtrac"                 http://oss.oetiker.ch/rrdtool-trac/   />
  <nav:but iana           "RRD MIB"                 iana/index                    />
  <nav:but cast           "Cast"                   cast                          />
 </nav:bar>

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 8d2322a47f2c0d25feb190a5fe3be8f1be766fa3..68822b8d1165b25e0d27df988784c1b17ab4d140 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -14,6 +14,7 @@ while we wait for new material to arrive.</p>
 <h2>RRDtool Companions</h2>
 
 #include "drraw.xml"
+#include "dsreport.xml"
 #include "rrd_merger.xml"
 #include "weathermap4rrd.xml"  
 #include "rrdutils.xml"
@@ -28,6 +29,7 @@ while we wait for new material to arrive.</p>
 #include "bigsis_rrdworld.xml"
 #include "cacti.xml"
 #include "collectd.xml"
+#include "eluna_graph_system.xml"
 #include "mailgraph.xml"
 #include "monitorix.xml"
 #include "munin.xml"

diff --git a/website/site-sync b/website/site-sync
index a963a727d8f3ab568a2ae5228f2b08d11a026b04..274b0be9b8649cc455ce3c5c31b1b52e8fed88a1 100755 (executable)
--- a/website/site-sync
+++ b/website/site-sync
@@ -43,7 +43,7 @@ mirror by <a target="_top" href="http://YOUR.SITE">Company</a>
 HEAD
 
 for xt in html png gif ico css htaccess js; do
-  gfind . -name "*.$xt" -not -name stat"*" -not -name "hoster*" -exec printf '<a href="{}">.</a>' \; >> mirror.html
+  find . -name "*.$xt" -not -name stat"*" -not -name "hoster*" -exec printf '<a href="{}">.</a>' \; >> mirror.html
 done
 echo "</body></html>"                                     >> mirror.html