ungoogle and unamazone

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

diff --git a/website/download.wml b/website/download.wml
index 2ef18d05b5de0ea693f3f62e0120b258fea38785..581f7977d286c5f91bd5e21e19accda2ba910c20 100644 (file)
--- a/website/download.wml
+++ b/website/download.wml
@@ -28,7 +28,7 @@ You can download RRD tool from several places:
 <H2>Binary Distributions</H2>
 
 <UL>
- <LI>HP-UX by <A HREF="mailto:s_angelov@filibeto.org">Stoyan Angelov</A> -- <A HREF="http://www.filibeto.org/~aduritz/truetrue/rrdtool/">http://www.filibeto.org/~aduritz/truetrue/rrdtool/</A></LI>
+ <LI>HP-UX by <A HREF="mailto:hpux@connect.org.uk">Richard Lloyd</A> -- <A HREF="http://hpux.connect.org.uk/hppd/cgi-bin/search?term=rrdtool-">http://hpux.connect.org.uk/hppd/cgi-bin/search?term=rrdtool-</A></LI>
  <LI>Solaris OpenCSW <A HREF="http://www.opencsw.org/packages/rrdtool"> http://www.opencsw.org/packages/rrdtool</a></LI>
  <LI>Debian Linux <A HREF="http://packages.debian.org/rrdtool">http://packages.debian.org/rrdtool</A></LI>
  <LI>T2 SDE Linux <A HREF="http://www.t2-project.org/packages/rrdtool.html">http://www.t2-project.org/packages/rrdtool.html</a></li>

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 7568790495871a6cd81981dbe8cbac602d38a0b9..d50e7de943a298690eb8ce21847f1ce1fef63ec9 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -31,8 +31,7 @@
 <li><div><a href="../doc/index.en.html">Documentation </a></div></li>
 <li><div><a href="../tut/index.en.html">Tutorials </a></div></li>
 <li><div><a href="../prog/index.en.html">Programming </a></div></li>
-<li><div><a href="http://oss.oetiker.ch/rrdtool-trac/">Bugs, Wiki</a></div></li>
-<li><div><a href="../support.en.html">Support </a></div></li>
+<li><div><a href="https://github.com/oetiker/rrdtool-1.x">Bugs, Wiki</a></div></li>
 <li><div class="selected">Gallery </div></li>
 <li><div><a href="../rrdworld/index.en.html">Projects using RRDtool </a></div></li>
 <li><div><a href="../sponsor.en.html">Sponsoring RRDtool </a></div></li>
@@ -76,17 +75,16 @@
 <br />
 <br />
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.gwos.com"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="../logos/GroundWork-200x100.jpg" width="200" height="100" /></a></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="../inc/rrdtool-gold.png" width="200" height="100" /></a></p>
 <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>
+<a href="https://tobi.oetiker.ch/wish/"><img border="0" alt="Make Tobi Happy" src="../inc/happy-tobi.png" width="119" height="72" /></a>
 </div>
 <br />
 <br />
 <div>
-<iframe width="120" height="50" name="bandwidth" frameborder="0" src="../hoster.html"></iframe>
 </div>
 <br />
 <br />
@@ -96,10 +94,6 @@
 <!-- # Logo and Body -->
 <!-- ############################# -->
 <td id="bodycell" valign="top">
-<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>-->
-</div>
 <div id="logo">
 <div class="legacy">
 RRDtool
@@ -111,11 +105,6 @@ RRDtool
 <!-- ############################# -->
 <div id="body">
 <h1>RRDtool Gallery</h1>
-<div id="googlead_right">
-<script type="text/javascript"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width="300"; amazon_ad_height="250"; amazon_ad_logo="hide"; amazon_ad_price="retail"; amazon_ad_border="hide";//--></script>
-<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</div>
  <!-- no wider than 600 pixle -->
  <!-- creation date -->
 <div class="gallery">
@@ -125,6 +114,12 @@ amazon_ad_tag = "tobistools-20"; amazon_ad_width="300"; amazon_ad_height="250";
 actual volume of transactions for MMS submitions, from 3 differents devices,
 such
 as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella &lt;alessio.r-delme-@<span class="legacy">XYZ-</span>tiscalinet.it&gt;, 2006/3 </div>
+</div>
+ <!-- no wider than 600 pixle -->
+<div class="gallery">
+<h2> Solar inverter prodction versus consumption </h2>
+<div class="image"><img src="sma_inverter.png" alt="" width="583" height="449" /></div>
+<div class="caption"> SMA solar inverter production compared to the electricity consumption -- Joris Struyve &lt;joris..delete..@<span class="legacy">XYZ-</span>..delete..struyve.be&gt;, 2017/5 </div>
 </div>
 <div class="gallery">
 <h2>Aircraft seen in EDDV</h2>
@@ -165,11 +160,6 @@ for betting and healthy competition inside the team. -- Jaime G
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<p>
-<script type="text/javascript"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width="300"; amazon_ad_height="250"; amazon_ad_logo="hide"; amazon_ad_price="retail"; amazon_ad_border="hide";//--></script>
-<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</p>
 <h2> VMware cluster memory quickstats</h2>
 <div class="image"><img src="VMware_cluster_memory_quickstats.png" alt="" width="595" height="308" /></div>
 <div class="caption"> This graph helps you visualize VMware cluster memory consumption and overcommitment over time. -- Raphael Schitz &lt;raphael@<span class="legacy">XYZ-</span>schitz.net&gt;, 2013/10 <a href="https://github.com/rschitz/vCacti">[demo]</a></div>
@@ -790,7 +780,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-01/05/16 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+06/23/2017 | <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>
@@ -806,15 +796,5 @@ or KDE's <a href="http://www.konqueror.org">Konqueror</a> for example.
 It may also be that you are looking at a mirror page which did not copy <a href="../inc/design.css">the CSS</a> for this page. Or if some pictu
 res are missing, then the mirror may not have picked up the contents of the <a href="../inc/">inc</a> directory.
 </p>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
-  Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-374525-1', 'auto');
-  ga('require', 'linkid', 'linkid.js');
-  ga('send', 'pageview');
-</script>
 </body>
 </html>

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 270e9897d8959ce881a9e9369504167a6c594cf9..e5874c70372d260877f353506dcadd434793936e 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,7 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "sma_inverter.xml"
 #include "aircraft.xml"
 #include "gsm-signal.xml"
 #include "sunny.xml"

diff --git a/website/inc/design.css b/website/inc/design.css
index 446405a122200dd4e4a34b294cfbf88da22388c5..fe888d4c9e03c6e75ed2265d1b4e47fc590dda12 100644 (file)
--- a/website/inc/design.css
+++ b/website/inc/design.css
@@ -112,6 +112,7 @@ div#body pre a{
 div#googlead_right {
   background-color: white;
   float: right;
+  width: 200px;
   margin-top: 5px;
   padding-left: 20px;
   margin-left: 20px;

diff --git a/website/inc/html.inc b/website/inc/html.inc
index d4b689d0022b0c178fab90bed2ff6332cfc0b1ba..60dd338def9c79f446f8eeddbce9f4170e87aa3a 100644 (file)
--- a/website/inc/html.inc
+++ b/website/inc/html.inc
@@ -9,11 +9,6 @@ $x =~ s/\\n/ /g; print $x; :>:#H1_FLAT#}
 <if <get-var title_is_set /> ""
    {#Title#:{#H1_FLAT#}:#Title#}
 />
-<div id="googlead_right">
-<script type="text/javascript"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
-<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</div>
 <restore subtitle />
 </define-tag>
 
@@ -25,36 +20,12 @@ kjhasdflkjhasdf
 s/\\n/ /g; print :>:#Title#}
 </define-tag>
 
-<perl>my $addcount=0;</perl>
-
 <define-tag h2 whitespace=delete endtag=required>
-<perl>
-$addcount++;
-if ($addcount == 7){
-print <<'GOOGLEAD';
-<p>
-<script type="text/javascript"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
-<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</p>
-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"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
-<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</p>
-GOOGLEAD
-}
-</perl>
+
 <h3* %attributes>%body</h3*>
 </define-tag>

diff --git a/website/inc/navbar-def.inc b/website/inc/navbar-def.inc
index c0b5ac99dcf5f99101dd455ececfa28b8d97d36d..c735326ac5a70408d9b95b96278d99ebee1555a1 100644 (file)
--- a/website/inc/navbar-def.inc
+++ b/website/inc/navbar-def.inc
@@ -61,7 +61,7 @@
 </define-tag>
 
 <define-tag nav:but>
-   <if <match "%2" "http://|html$|\?|/$|^$" />
+   <if <match "%2" "https?://|html$|\?|/$|^$" />
    <navbar:button id="%0" 
                     url="%2" 
                     txt="%1"

diff --git a/website/inc/pub_contrib_header.html b/website/inc/pub_contrib_header.html
index 9cd75a9dc5093153482b924a2a950cc9a2c9f48a..eaf4d7082f5f6de44eff9d9e2bfc662c41cfc8b7 100644 (file)
--- a/website/inc/pub_contrib_header.html
+++ b/website/inc/pub_contrib_header.html
@@ -75,14 +75,11 @@
 <br />
 <br />
 <br />
-<p><b>Gold Sponsors</b></p>
-<p><a href="http://www.gwos.com"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="../../logos/GroundWork-200x100.jpg" width="200" height="100"></a></p>
 <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="45" height="27" /></a></div>
 <br />
-<div><iframe width="120" height="50" name="bandwidth" frameborder="0" src="../../hoster.html" id="bandwidth"></iframe></div>
 <br />
 <br /></div>
 </td>
@@ -90,11 +87,6 @@
 <!-- # Logo and Body -->
 <!-- ############################# -->
 <td id="bodycell">
-<div id="mirrors"><a href="http://oss.oetiker.ch/rrdtool/pub/contrib/index.en.html">Swiss Original</a>.&nbsp;Mirrors: <a href="http://rrdtool.mirror.graemef.net/pub/contrib/index.en.html">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
-<a href="http://rrdtool.cs.pu.edu.tw/pub/contrib/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
-<a href="http://rrdtool.trexle.net/pub/contrib/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
-<a href="http://rrdtool.paracoda.com/pub/contrib/index.en.html">CA</a><!--Hossam Hossny <admin@paracoda.com>-->
-<a href="http://rrdtool.PlaySystems.ro/pub/contrib/index.en.html">RO</a><!--dan.draghici@ulbsibiu.ro--></div>
 <div id="logo">
 <div class="legacy">RRDtool
 <hr /></div>
@@ -104,11 +96,3 @@
 <!-- ############################# -->
 <div id="body">
 <h1>RRDtool Crontrib Area</h1>
-<div>
-<script type="text/javascript"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width = "728"; amazon_ad_height =
-"90"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border
-= "hide";//--></script>
-<script type="text/javascript"
-src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</div>

diff --git a/website/inc/pub_footer.html b/website/inc/pub_footer.html
index 117ab155ddf19b459dd0479b0e11eeaac6ee4fe9..d91c41c4ad58c2d83f07345e790286a8b93375c2 100644 (file)
--- a/website/inc/pub_footer.html
+++ b/website/inc/pub_footer.html
@@ -12,19 +12,5 @@
 </table>
 <hr class="legacy" />
 <p class="legacy" style="border-width: 1px; border-color: red; padding: 5px;"><b>NOTE:</b> The content of this website is accessible with any browser. The graphical design though relies completely on CSS2 styles. If you see this text, this means that your browser does not support CSS2. Consider upgrading to a standard conformant browser like Mozilla <a href="http://www.getfirefox.com">Firefox</a> or <a href="http://www.opera.com">Opera</a> but also Apple's <a href="http://www.apple.com/safari/">Safari</a> or KDE's <a href="http://www.konqueror.org">Konqueror</a> for example. It may also be that you are looking at a mirror page which did not copy <a href="../inc/design.css">the CSS</a> for this page. Or if some pictu res are missing, then the mirror may not have picked up the contents of the <a href="../inc/">inc</a> directory.</p>
-<script>
-
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
-Date();a=s.createElement(o),
-
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-374525-1', 'auto');
-  ga('send', 'pageview');
-
-</script>
 </body>
 </html>

diff --git a/website/inc/pub_header.html b/website/inc/pub_header.html
index 6ed26e6fc345f5b324119025c700f6241f054498..da358e251afed8662265bbf14e4b8d40b15e017f 100644 (file)
--- a/website/inc/pub_header.html
+++ b/website/inc/pub_header.html
@@ -6,7 +6,6 @@
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 <link rel="icon" href="../inc/favicon.ico" type="image/ico" />
 <title>RRDtool - RRDtool Download Area</title>
-<!--[if lt IE 7]><script src="../inc/IE7/ie7-standard-p.js" type="text/javascript"></script><![endif]-->
 
 <style type="text/css">
 <!--/* <![CDATA[ */
@@ -75,15 +74,12 @@
 <br />
 <br />
 <br />
-<p><b>Gold Sponsors</b></p>
-<p><a href="http://www.gwos.com"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="../logos/GroundWork-200x100.jpg" width="200" height="100"></a></p>
 <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="45" height="27" /></a></div>
 <br />
 <br />
-<div><iframe width="120" height="50" name="bandwidth" frameborder="0" src="../hoster.html" id="bandwidth"></iframe></div>
 <br />
 <br /></div>
 </td>
@@ -91,11 +87,6 @@
 <!-- # Logo and Body -->
 <!-- ############################# -->
 <td id="bodycell">
-<div id="mirrors"><a href="http://oss.oetiker.ch/rrdtool/pub/index.en.html">Swiss Original</a>.&nbsp;Mirrors: <a href="http://rrdtool.mirror.graemef.net/pub/index.en.html">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
-<a href="http://rrdtool.cs.pu.edu.tw/pub/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
-<a href="http://rrdtool.trexle.net/pub/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
-<a href="http://rrdtool.paracoda.com/pub/index.en.html">CA</a><!--Hossam Hossny <admin@paracoda.com>-->
-<a href="http://rrdtool.PlaySystems.ro/pub/index.en.html">RO</a><!--dan.draghici@ulbsibiu.ro--></div>
 <div id="logo">
 <div class="legacy">RRDtool
 <hr /></div>
@@ -105,14 +96,7 @@
 <!-- ############################# -->
 <div id="body">
 <h1>RRDtool Download Area</h1>
-<div>
-<script type="text/javascript"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width = "728"; amazon_ad_height =
-"90"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border
-= "hide";//--></script>
-<script type="text/javascript"
-src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</div>
+
 
 
 

diff --git a/website/inc/template.inc b/website/inc/template.inc
index 1b1654b3e2eda3852ae1a9b1c8a44621cb377df8..fae8869c5e7caae25cf60267f2874039e974a695 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -82,19 +82,18 @@
 <p><b>Gold Sponsors</b></p>
 #<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=rrdtool&utm_campaign=mrtg"><img border="0" title="Serverscheck" alt="Serverscheck" src="$(ROOT)/logos/serverscheck-3.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="http://www.gwos.com"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/GroundWork-200x100.jpg"/></a></p>
-#<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
+#<p><a href="http://www.gwos.com"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/GroundWork-200x100.jpg"/></a></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
 #<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
 <p><a href="$(ROOT)/sponsor.<lang:star: */>.html">Silver Sponsors ...</a></p>
 <br/>
 <br/>
 <div>
-<a href="http://tobi.oetiker.ch/wish/"><img border="0" alt="Make Tobi Happy" src="$(ROOT)/inc/happy-tobi.png"/></a>
+<a href="https://tobi.oetiker.ch/wish/"><img border="0" alt="Make Tobi Happy" src="$(ROOT)/inc/happy-tobi.png"/></a>
 </div>
 <br/>
 <br/>
 <div>
-<iframe width="120" height="50" name="bandwidth" frameborder="0" src="$(ROOT)/hoster.html"></iframe>
 </div>
 <br/>
 <br/>
@@ -104,19 +103,6 @@
 <!-- # Logo and Body -->
 <!-- ############################# -->
 <td id="bodycell" valign="top">
-# all mirrors seem dead currently
-<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.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>-->
-#<a href="http://rrdtool.basemirror.de/<where/>">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
-#<a href="http://rrdtool.mirroraty.org/<where/>">US</a><!--Hossam Hossny <hossam@trexle.com>-->
-#<a href="http://rrdtool.paracoda.com/<where/>">CA</a><!--Hossam Hossny <admin@paracoda.com>-->
-#<a href="http://rrdtool.PlaySystems.ro/<where/>">RO</a><!--dan.draghici@ulbsibiu.ro-->
-</div>
 <div id="logo">
 <div class="legacy">
 RRDtool
@@ -137,17 +123,7 @@ RRDtool
 <!-- ############################# -->
 <!-- # FOOTER -->
 <!-- ############################# -->
-<perl>
-if ( -s "$(WML_SRC_BASENAME).wml" > 4000 ){
-print <<'GOOGLEAD';
-<div style="clear:right">
-<script type="text/javascript"><!--
-amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--></script>
-<script type="text/javascript" src="http://ir-na.amazon-adsystem.com/s/ads.js"></script>
-</div>
-GOOGLEAD
-}
-</perl>
+
 <div id="address">
 <small>
 <perl>
@@ -188,16 +164,6 @@ 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>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
-  Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-374525-1', 'auto');
-  ga('require', 'linkid', 'linkid.js');
-  ga('send', 'pageview');
-</script>
 </body>
 </html>
 

diff --git a/website/index.wml b/website/index.wml
index 14847e61bac5508983f4f772a992e49d02c9224d..5772e1b4219c470e72b02dba6b367b5368777ed4 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -41,7 +41,7 @@ applications.</p>
 
 <h2>News</h2>
 
-<p>For the lastest news regarding RRDtool, check the <a href="http://oss.oetiker.ch/rrdtool/forum.en.html#nabble-f937719">Announcements Mailinglist Archive</a>.
+<p>For the latest news regarding RRDtool, check the <a href="http://oss.oetiker.ch/rrdtool/forum.en.html#nabble-f937719">Announcements Mailinglist Archive</a>.
 Or add our <a href="https://www.facebook.com/rrdtool.org">Facebook</a> and <a href="https://plus.google.com/117394673819512590121" rel="publisher">Google+</a> pages.</p>
 
 <h2>Download</h2>

diff --git a/website/navbar.inc b/website/navbar.inc
index 35c68616c03e9dc59e7993818e9c2dd90e19906f..dffa7b366fa0b875b91c0af13e0931c720e34013 100644 (file)
--- a/website/navbar.inc
+++ b/website/navbar.inc
@@ -4,8 +4,7 @@
  <nav:but doc            "Documentation"           doc/index          doc       />
  <nav:but tut            "Tutorials"               tut/index           tut       />
  <nav:but prog           "Programming"             prog/index          prog      />
- <nav:but rrdtrac        "Bugs, Wiki"              http://oss.oetiker.ch/rrdtool-trac/   />
- <nav:but support        "Support"                 support             sup_forum />
+ <nav:but rrdtrac        "Bugs, Wiki"              https://github.com/oetiker/rrdtool-1.x   />
  <nav:but gallery        "Gallery"                 gallery/index                        />
  <nav:but rrdworld       "Projects using RRDtool"  rrdworld/index                />
  <nav:but sponsor        "Sponsoring RRDtool"      sponsor                       />

diff --git a/website/rrdworld/eluna_graph_system.png b/website/rrdworld/eluna_graph_system.png
index f8e339af8b94fe80fb95bb7ac97187d7241ef5f7..c8286a60b3d42863dd35a2802d419b101b0a13a7 100644 (file)
Binary files a/website/rrdworld/eluna_graph_system.png and b/website/rrdworld/eluna_graph_system.png differ

diff --git a/website/rrdworld/eluna_graph_system.xml b/website/rrdworld/eluna_graph_system.xml
index 6bbf907c7ebcf6af4dbb50caad97ca6f95f12e94..6482052897f51d600b7d07a0b7cbc169d96a085d 100644 (file)
--- a/website/rrdworld/eluna_graph_system.xml
+++ b/website/rrdworld/eluna_graph_system.xml
@@ -1,13 +1,13 @@
-<rrdworld type="application"
-          icon="eluna_graph_system.png" >
-
-       <name> eLuna Graph System </name>
-     <author> Stephane Dupont </author>
-<description> eLuna Graph System is an application written in Perl based on RRDTool and distributed under GNU General Public License. Its aim is collection, and then presentation in graphic form, of data, to aid in monitoring of a Linux machine. </description>
-   <homepage> http://www.eluna.org/eluna_graph_system.html </homepage>
-       <year> 2006 </year><month> 4 </month>
-    <license> GPL </license>
-   <livesite> http://graphs.eluna.org </livesite>
-      <email> steph@eluna.org </email>
-
-</rrdworld>
+<rrdworld type="application"\r
+          icon="eluna_graph_system.png" >\r
+\r
+       <name> eLuna Graph System </name>\r
+     <author> Stephane Dupont </author>\r
+<description> eLuna Graph System is an application written in Perl based on RRDTool and distributed under GNU General Public License. Its aim is collection, and then presentation in graphic form, of data, to aid in monitoring of a Linux machine. </description>\r
+   <homepage> https://github.com/stephanedupont/eLunaGraphSystem </homepage>\r
+       <year> 2006 </year><month> 4 </month>\r
+    <license> GPL </license>\r
+   <livesite> http://graphs.eluna.org </livesite>\r
+      <email> stephane.dupont.be@gmail.com </email>\r
+\r
+</rrdworld>
\ No newline at end of file

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 5f2ceeea2507d5caff59fdec1a9ca8b540578a51..d31d75c0edcfa31f5b5a88b32b330f174f189ad0 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -60,6 +60,7 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "smokeping.xml"
 #include "snm_at_rrdworld.xml"
 #include "snmpgraph.xml"
+#include "stat.xml"
 #include "statsdawg.xml"
 #include "stormons.xml"
 #include "systemgraph.xml"

diff --git a/website/site-sync b/website/site-sync
index 88cf10841f1f00c8a3ff47788559c6bcae700f30..ed5c128fc56c3639ac013f2374e3d319c0300c14 100755 (executable)
--- a/website/site-sync
+++ b/website/site-sync
@@ -1,3 +1,3 @@
-rsync --copy-unsafe-links --verbose --times --delete --exclude pub --exclude='*~' --exclude=".svn" --exclude=".condor" -r . oposs@oss.oetiker.ch:public_html/rrdtool/
+rsync --copy-unsafe-links --verbose --times --delete --exclude pub --exclude='*~' --exclude=".svn" --exclude=".condor" -r . oposs@freddie:public_html/rrdtool/
 #rsync --copy-unsafe-links --verbose --times --delete --exclude pub --exclude='*~' --exclude=".svn" --exclude=".condor" -r . /home/oetiker/public_html/webtools/rrdtool
 #rsync --links --verbose --times --delete --exclude pub --exclude='*~' --rsh=ssh -r . tobi@ipn.caida.org:/ipn/web/Tools/RRDtool

diff --git a/website/sponsor.wml b/website/sponsor.wml
index 612fd83764b5c540f1e10749fc7216701a8a4719..20c97a2c2e37de77b4fe45bf667c3b86b4808742 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -11,32 +11,38 @@ If you profit from RRDtool and want to support the project as a whole, you
 could <a href="http://www.oetiker.ch/home/oss/sponsoring/">become a
 sponsor</a>!</p>
 
-<h2>2016 Gold Sponsors</h2>
-<p>
+<h2>2018 Silver Sponsors</h2>
+
+<p><a href="http://www.swinog.ch"><img border="0" title="SwiNOG" alt="SwiNOG" src="$(ROOT)/logos/swinog-101x51.png"/></a>&nbsp;</p>
+
+#<h2>2016 Gold Sponsors</h2>
+#<p>
 # heather.gray@foxt.com
-<a href="http://www.gwos.com/"><img border="0" alt="GroundWork Inc" src="$(ROOT)/logos/GroundWork-200x100.jpg"/></a>&nbsp;
-</p>
+#<a href="http://www.gwos.com/"><img border="0" alt="GroundWork Inc" src="$(ROOT)/logos/GroundWork-200x100.jpg"/></a>&nbsp;
+#</p>
 
-<h2>2016 Silver Sponsors</h2>
-<p>
+#<h2>2016 Silver Sponsors</h2>
+#<p>
 # stuart@irisns.com
-<a href="http://www.irisns.com"><img border="0" title="IRIS" alt="IRIS" src="$(ROOT)/logos/iris.png"/></a>&nbsp;
-<a href="http://www.psw.net"><img border="0" title="No matter whether it concerns an SSL certificate issued by renowned certificate authorities or an ISO 27001
-certification, the PSW GROUP is your competent partner. Our focus is your security: breaking new ground together, always
-focussed on our customers success. We assist you to establish a solid information security management system and gain a
-globally recognised quality seal enabling you to prove trust and attract more customers." alt="PSW GROUP GmbH &amp; Co. KG" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
-<a href="http://www.swinog.ch"><img border="0" title="SwiNOG" alt="SwiNOG" src="$(ROOT)/logos/swinog-101x51.png"/></a>&nbsp;
-# Oscar Travis oscar@chameleonjohn.com
-<a href="http://www.chameleonjohn.com/"><img border="0" alt="chameleonjohn.com" src="$(ROOT)/logos/chameleonjohn-logo.jpg"/></a>&nbsp;
-# pavel.hampl@xorux.com
-<a href="http://www.xorux.com/"><img border="0" alt="xorux.com" src="$(ROOT)/logos/xorux_101x51.png"/></a>&nbsp;
-#From: David Schweikert <dws@open.ch>
-<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
-# Felix Schueren <felix.schueren@hosteurope.de> Thu, 21 Dec 2006 12:24:51 +0100
-<a href="http://www.hosteurope.de/"><img border="0" alt="HostEurope" src="$(ROOT)/logos/HE_Logo_101x51.gif"/></a>&nbsp;
-# "Helfer, Julia" <Julia.Helfer@wuerth-phoenix.com>
-<a href="http://www.wuerth-phoenix.com/neteye"><img border="0" alt="Wuerth Phoenix" src="$(ROOT)/logos/wuerth-phoenix.png"/></a>&nbsp;
-</p>
+#<a href="http://www.irisns.com"><img border="0" title="IRIS" alt="IRIS" src="$(ROOT)/logos/iris.png"/></a>&nbsp;
+#<a href="http://www.psw.net"><img border="0" title="No matter whether it concerns an SSL certificate issued by renowned certificate authorities or an ISO 27001
+#certification, the PSW GROUP is your competent partner. Our focus is your security: breaking new ground together, always
+#focussed on our customers success. We assist you to establish a solid information security management system and gain a
+#globally recognised quality seal enabling you to prove trust and attract more customers." alt="PSW GROUP GmbH &amp; Co. KG" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
+#<a href="http://www.swinog.ch"><img border="0" title="SwiNOG" alt="SwiNOG" src="$(ROOT)/logos/swinog-101x51.png"/></a>&nbsp;
+## Oscar Travis oscar@chameleonjohn.com
+#<a href="http://www.chameleonjohn.com/"><img border="0" alt="chameleonjohn.com" src="$(ROOT)/logos/chameleonjohn-logo.jpg"/></a>&nbsp;
+## pavel.hampl@xorux.com
+#<a href="http://www.xorux.com/"><img border="0" alt="xorux.com" src="$(ROOT)/logos/xorux_101x51.png"/></a>&nbsp;
+##From: David Schweikert <dws@open.ch>
+#<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
+## Felix Schueren <felix.schueren@hosteurope.de> Thu, 21 Dec 2006 12:24:51 +0100
+#<a href="http://www.hosteurope.de/"><img border="0" alt="HostEurope" src="$(ROOT)/logos/HE_Logo_101x51.gif"/></a>&nbsp;
+## "Helfer, Julia" <Julia.Helfer@wuerth-phoenix.com>
+#<a href="http://www.wuerth-phoenix.com/neteye"><img border="0" alt="Wuerth Phoenix" src="$(ROOT)/logos/wuerth-phoenix.png"/></a>&nbsp;
+## Adrian Riedo <adrian@riedo.com>
+#<a href="http://www.riedonetworks.com"><img border="0" alt="Riedo Networks Ltd" src="$(ROOT)/logos/e3meter.png"/></a>&nbsp;
+#</p>
 
 #<h2>2015 Silver Sponsors</h2>
 #<p>

diff --git a/website/support.wml b/website/support.wml
index 406a9d2ef681de8a6c7e7ae6cc3f55923336ba68..def6262330264601ad8bf65233690b1888851ea8 100644 (file)
--- a/website/support.wml
+++ b/website/support.wml
@@ -3,10 +3,11 @@
        
 <H1>Support</H1>
 
-<H2>RRD Wizard</H2>
 
-<p>If you just can't seem to cram all the RRDtool options into your head, you may find Ivan Zahariev's
-<a href="http://www.famzah.net/rrdwizard">RRDtool Wizard</a> most helpful. It will help you build these command lines in a snap.</p>
+<H2>RRDTool Gitter Chat</H2>
+
+<p>There is an <a href="https://gitter.im/oetiker/rrdtool-1.x">RRDtool Chat</a> on Gitter.
+Login to meet other rrdtool users and developers.</p>
 
 <H2>rrd-announce mailing list</H2>
 
@@ -33,22 +34,12 @@ this list by sending a message with the subject 'subscribe' to <A
 HREF="mailto:rrd-developers-request@lists.oetiker.ch?subject=subscribe">rrd-developers-request@lists.oetiker.ch</A>.
 Or on the <a href="http://lists.oetiker.ch">web interface</a>.</p>
 
-<h2>list archive</h2>
-
-<P>There is an archive of past list traffic on <A
-HREF="http://gmane.org/find.php?list=rrd/">Gmane</A> and the <a
-HREF="http://www.mail-archive.com/index.php?hunt=rrd">"The Mail
-Archive"</A>.</P>
+<h2>RRDtool Development</h2>
 
-<h2>RRDtool Trac</h2>
+<p>RRDtool development and issue tracking happens on the <a
+href="https://github.com/oetiker/rrdtool-1.x/">RRDtool Github Repo</a>.</p>
 
-<p>Bug Tracking, user maintained documentation and SVN access live in the <a
-href="http://oss.oetiker.ch/rrdtool-trac/">RRDtrac</a> site. Check it
-out.</p>
-
-<h2>the #rrdtool channel on IRCnet</h2>
+<H2>RRD Wizard</H2>
 
-<p>On IRCnet there is an #rrdtool channel where you can meet fellow rrdtool
-users online. It has it's own <a
-href="http://www.krogloth.de/rrd/">homepage</a> with instructions about how
-to connect.</p>
+<p>If you just can't seem to cram all the RRDtool options into your head, you may find Ivan Zahariev's
+<a href="http://www.famzah.net/rrdwizard">RRDtool Wizard</a> most helpful. It will help you build these command lines in a snap.</p>