sponsor number 1 is in

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

diff --git a/website/inc/design.css b/website/inc/design.css
index fd8be5f068b8957bfd7c85a6ff92e46ecf393c1b..84decab325fa301d0912a846d1b112bb2b59d505 100644 (file)
--- a/website/inc/design.css
+++ b/website/inc/design.css
@@ -15,7 +15,7 @@ body {
  * layout              
  **************************/
 table#frame  {
-        width: 850px;
+        width: 950px;
         margin: 10px auto;
         border-collapse: collapse;
         text-align: left;
@@ -201,21 +201,25 @@ table#frame td#menucell {
 div#menu {
   font-weight: normal;
   margin-top: 20px;
-  margin-left: 20px;
-  margin-right: 20px;
+  margin-left: 10px;
+  margin-right: 10px;
   font-size: 14px;
-  width: 120px;
+  width: 200px;
   line-height: 1em;
 }
 
 div#menu li {
-  margin-top: 0.7em;
-  margin-bottom: 0.7em;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-top-style: dotted;
+  border-top-width: 1px;
+  border-top-color: #444;
 }
 
 div#menu li li {
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  border-top-color: #ccc;
 }
 
 div#menu a {
@@ -244,6 +248,16 @@ div#menu ul div.selected {
   padding-left: 0px;
 }
 
+div#menu ul ul {
+  margin-top: 3px;
+}
+
+div#menu > ul {
+  border-bottom-style: dotted;
+  border-bottom-width: 1px;
+  border-bottom-color: #888;
+}
+
 div#menu ul ul ul li {
   padding-left: 1em;
 }

diff --git a/website/inc/pub_contrib_header.html b/website/inc/pub_contrib_header.html
index 2b677928010539f24f5b5f54c8e435c6f99ac354..e301c90af2ec10524b074d6cdee5ebe4f156f231 100644 (file)
--- a/website/inc/pub_contrib_header.html
+++ b/website/inc/pub_contrib_header.html
@@ -75,9 +75,14 @@
 <br />
 <br />
 <br />
-<a href="http://tobi.oetiker.ch/wish"><img border="0" src="../../inc/button.png" alt="" width="99" height="79" /></a><br />
+<p><b>Gold Sponsors</b></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="RRDtool Gold Sponsor" src="../../inc/rrdtool-gold.png" width="200" height="100" /></a></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="RRDtool Gold Sponsor" 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="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>

diff --git a/website/inc/pub_header.html b/website/inc/pub_header.html
index 5eac666e8e8d51c4fbb9bd09270b6ce808da1879..a374f5aeee4eb76bc9a29cf79042ebcee4aa8b18 100644 (file)
--- a/website/inc/pub_header.html
+++ b/website/inc/pub_header.html
@@ -75,7 +75,13 @@
 <br />
 <br />
 <br />
-<a href="http://tobi.oetiker.ch/wish"><img border="0" src="../inc/button.png" alt="" width="99" height="79" /></a><br />
+<p><b>Gold Sponsors</b></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="RRDtool Gold Sponsor" src="../inc/rrdtool-gold.png" width="200" height="100" /></a></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="RRDtool Gold Sponsor" 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="45" height="27" /></a></div>
 <br />
 <br />
 <div><iframe width="120" height="50" name="bandwidth" frameborder="0" src="../hoster.html" id="bandwidth"></iframe></div>

diff --git a/website/inc/silver-logo.png b/website/inc/silver-logo.png
new file mode 100644 (file)
index 0000000..8759bac
Binary files /dev/null and b/website/inc/silver-logo.png differ

diff --git a/website/inc/template.inc b/website/inc/template.inc
index e09c2ab94ff8b605eae47dd50433dd988d967f6f..3065d7d69d750999a9b0b5607b1f1ee1f86f4807 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -45,7 +45,15 @@
 <br/>
 <br/>
 <br/>
-<a href="http://tobi.oetiker.ch/wish"><img border="0" src="$(ROOT)/inc/button.png"/></a><br/>
+<p><b>Gold Sponsors</b></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="RRDtool Gold Sponsor" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="RRDtool Gold Sponsor" 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>
+</div>
 <br/>
 <br/>
 <div>

diff --git a/website/index.wml b/website/index.wml
index afc239e7d44a888afad49907e2c9585146115474..858a956426c9ab152ec139efe6438c06cb52dc62 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -4,6 +4,8 @@
 
 <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>
+
 <H2>Logging &amp; Graphing</H2>
 
 <p>The industry standard data logging and graphing application.

diff --git a/website/logos/op5logoweb101x51.gif b/website/logos/op5logoweb101x51.gif
new file mode 100644 (file)
index 0000000..95f8ba9
Binary files /dev/null and b/website/logos/op5logoweb101x51.gif differ

diff --git a/website/navbar.inc b/website/navbar.inc
index 38906bd08e99fe3dbe626950e6c06c788ae5fcf7..d5622bb4b99b6b409214f26ed43e4f0011c9fd31 100644 (file)
--- a/website/navbar.inc
+++ b/website/navbar.inc
@@ -1,16 +1,15 @@
 <nav:bar 0     main "">
  <nav:but welcome        "Welcome"                 index                         />
  <nav:but down           "Download"                download            pub       />
- <nav:but license        "License"                 license                       />
  <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                       />
- <nav:but sponsor        "Sponsorship"             sponsor                       />
  <nav:but gallery        "Gallery"                 gallery/index                        />
- <nav:but rrdworld       "RRDworld"                rrdworld/index                />
- <nav:but prog           "Programming"             prog/index          prog      />
- <nav:but rrdtrac        "RRDtrac"                 http://oss.oetiker.ch/rrdtool-trac/   />
- <nav:but iana           "RRD MIB"                 iana/index                    />
+ <nav:but rrdworld       "Projects using RRDtool"  rrdworld/index                />
+ <nav:but sponsor        "Sponsoring RRDtool"      sponsor                       />
+ <nav:but license        "License"                 license                       />
  <nav:but cast           "Cast"                   cast                          />
 </nav:bar>
 
@@ -28,6 +27,7 @@
 </nav:bar>
 
 <nav:bar 1 prog           "prog/">
+<nav:but iana           "RRD MIB"                 ../iana/index                    />
 #include "prog/navbar.inc"
 </nav:bar>
 

diff --git a/website/rrdworld/n2rrd.xml b/website/rrdworld/n2rrd.xml
index 23859870183607a576bf70c00fa3279185a17dbe..acbbb9ca23e3269c46b5c4239bd76de4ac4cf4aa 100644 (file)
--- a/website/rrdworld/n2rrd.xml
+++ b/website/rrdworld/n2rrd.xml
@@ -11,7 +11,7 @@ RRA (Round Robin Archives). The resulting archives can later be viewed by any RR
 
    <!-- Optional -->
 
-   <livesite> http://mon.diglinks.com/cgi-bin/rrd2graph.cgi?hostname=demo&service=icmp </livesite>
+   <livesite> http://mon.diglinks.com/cgi-bin/rrd2graph.cgi?hostname=demo&amp;service=icmp </livesite>
       <email> badri@diglinks.com </email> <!-- Author contact -->
 
 </rrdworld>

diff --git a/website/sponsor.wml b/website/sponsor.wml
index fce6c9e3eafe410be14922d858d9a94076ee7187..03899d728c763d87e88c51b436de62339c91367c 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -1,40 +1,36 @@
 <PAGE AUTHOR = "Tobias Oetiker <tobi@oetiker.ch>"
         PAGE = "sponsor">
 
+<h1>Sponsorship</h1>
 
-<H1>Sponsorship</H1>
+<p>These days I finance my work on RRDtool by developing <a
+href="http://it.oetiker.ch/monitoring/support.var">customer specific add-on
+features and support contracts</a>. Since this work is focused towards the
+customers requirments this does not leave much room for general improvment.
+If you profit from MRTG and want to support the project as a whole. You
+could <a href="http://it.oetiker.ch/monitoring/sponsoring.var">become a
+sponsor</a>!</p>
 
-<p>I do most of my work on RRDtool in my spare time, as time permits. This
-leads to quite slow development and long release cycles. This does not have
-to be this way. If you would like to see a special feature in RRDtool or
-just want to ensure continued development of RRDtool, please contact me
-(tobi@oetiker.ch) for an offer.</p>
+<h2>2007 Sponsors</h2>
 
-<h2>Current Sponsors</h2>
+<p>
+# Johannes Dagemark <jd@op5.se> Wed, 13 Dec 2006 16:20:01 +0100
+<a href="http://www.op5.com"><img border="0" alt="Silver Sponsor" src="$(ROOT)/logos/op5logoweb101x51.gif"/></a>&nbsp;
+<a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Silver Sponsor" src="$(ROOT)/inc/silver-logo.png"/></a>&nbsp;
+<a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Silver Sponsor" src="$(ROOT)/inc/silver-logo.png"/></a>&nbsp;
+<a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Silver Sponsor" src="$(ROOT)/inc/silver-logo.png"/></a>      
+</p>
 
-<p>since January 2006 - <b><a href="http://kfw.de">Kreditanstalt für Wiederaufbau</a>, Germany</b> - sponsors the libart to Cairo port for RRDtool version 1.3.</p>
+<h2>2006 Sponsors</h2>
 
-<h2>Past Sponsors</h2>
+<p><b><a href="http://kfw.de">Kreditanstalt für Wiederaufbau</a>, Germany</b> - sponsors the libart to Cairo port for RRDtool version 1.3.</p>
 
-<p>Mai-June 2005 - <b><a href="http://cablecom.ch">Cablecom GmbH</a>, Switzerland</b> - sponsored the publication of RRDtool version 1.2.</p>
-<p>June-August 1999 - <b><a href="http://caida.org">CAIDA</a>, USA</b> - gave me three months carte blanche to finish writing RRDtool 1.0.</p>
+<h2>Other means for making Tobi happy</h2>
 
-<H2>Other means for making Tobi happy</H2>
-
-<P>If you like RRDtool and want to show me your appreciation , have a look
-at my <A HREF="http://people.ee.ethz.ch/oetiker/wish">media wishlist</A>.
-Please put your <B>eMail</B> address into the the message area, so that I
+<p>If you like MRTG and want to show me your appreciation personally, have a look
+at my <a HREF="http://tobi.oetiker.ch/wish">media wishlist</a>.
+Please put your <b>eMail</b> address into the the message area, so that I
 can thank you for your present. I do keep a list of people who sent me
-stuff. You can look at it <A
-HREF="http://people.ee.ethz.ch/oetiker/webtools/appreciators.txt">here</A>.</P>
-
-
-<P> <I>remember, information is not knowledge,<BR/>
-        knowledge is not wisdom<BR/>
-        wisdom is not truth<BR/>
-        truth is not  beauty<BR/>
-        beauty is not love<BR/>
-        love is not music<BR/>
-        music is the best</I><BR/>
--- frank zappa</p>
+stuff. You can look at it <a href="http://tobi.oetiker.ch/webtools/appreciators.txt">here</a>.</p>
+