fix image names

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

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

diff --git a/website/gallery/PS_Network_traffic.xml b/website/gallery/PS_Network_traffic.xml
new file mode 100644 (file)
index 0000000..267334c
--- /dev/null
+++ b/website/gallery/PS_Network_traffic.xml
@@ -0,0 +1,12 @@
+<gallery image="PS_Network_traffic.png" > <!-- no wider than 600 pixels -->
+      <title> PS Network Traffic </title>
+     <author> Enrique Gómez </author> 
+<description> This graph shows the PS network traffic generated from the users of a telecommunication operator using USB modems, smartphones.. for 24 hours. Interesting the period from 8:00AM to 8:00PM, where there are peaks of traffic every 15 minutes. These are generated by Smartphones sincro. </description>
+       <year> 2011 </year><month> 8 </month> <!-- creation date -->
+      
+   <!-- Optional -->   
+
+   <livesite> </livesite> 
+      <email> egomezm@gmail.com </email>
+
+</gallery>

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 42f73ff5873e55e89c1dd4fefbd88edca2cdbf76..334cff23a6f03dd77f5fbc6b7db9f761f756d665 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -138,6 +138,19 @@ src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 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>
+<div class="gallery">
+<h2>2wk Power Usage graph</h2>
+<div class="image"><img src="powermeter-2wk.png" alt="" /></div>
+<div class="caption">kWh usage from my house, measured with an attiny85 and an LDR connected to the kWh meter. Background color signifies high/low tariff. Graph uses various colors for usage level. -- Mark Janssen -- sig-io.nl &lt;mark@<span class="legacy">XYZ-</span>sig-io.nl&gt;, 2011/09 <a href="http://stats.revspace.nl/power/">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixels -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
+<h2> PS Network Traffic </h2>
+<div class="image"><img src="PS_Network_traffic.png" alt="" width="597" height="363" /></div>
+<div class="caption"> This graph shows the PS network traffic generated from the users of a telecommunication operator using USB modems, smartphones.. for 24 hours. Interesting the period from 8:00AM to 8:00PM, where there are peaks of traffic every 15 minutes. These are generated by Smartphones sincro. -- Enrique Gómez &lt;egomezm@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/8 <a href="">[demo]</a></div>
 </div>
  <!-- no wider than 600 pixle -->
         <!-- creation date -->
@@ -159,19 +172,6 @@ as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella &lt;alessio.r-delme
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<h2> Compare data with last week</h2>
-<div class="image"><img src="comp.png" alt="" width="600" height="327" /></div>
-<div class="caption"> To view the comparision of data collected today with last week sameday statistics, for last 24 hours. This is acheived by the SHIFT parameter in RRD, by shifting the time to the required number of days backwards, in my case 7 days back. Also, i have used cgi to pass parameters in runtime to calculate this shift difference. For example, if i would like to compare today's data with yesterday, then i would pass 1 as the daydelta to the cgi, whcih would calculate the SHIFT values. Then, i have used rrdcgi to render the grpahs in runtime. -- Amzath Ali Rahumathullah &lt;amzatha@<span class="legacy">XYZ-</span>gmail.com&gt;, 2010/10 </div>
-</div>
-   <!-- Optional -->
-<div class="gallery">
-<h2> Mikrotik Wireless Registration Graph </h2>
-<div class="image"><img src="mikrotik_wireless.png" alt="" width="597" height="357" /></div>
-<div class="caption"> This graph shows some important values of wireless connection. -- Tornike Zedginidze &lt;tz@<span class="legacy">XYZ-</span>orient-logic.com&gt;, 2010/4 </div>
-</div>
- <!-- no wider than 600 pixle -->
-        <!-- creation date -->
-<div class="gallery">
 <p>
 <script type="text/javascript"><!--
 google_ad_client = "pub-8135238818549668";
@@ -190,6 +190,19 @@ google_color_text = "000000";
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
 </p>
+<h2> Compare data with last week</h2>
+<div class="image"><img src="comp.png" alt="" width="600" height="327" /></div>
+<div class="caption"> To view the comparision of data collected today with last week sameday statistics, for last 24 hours. This is acheived by the SHIFT parameter in RRD, by shifting the time to the required number of days backwards, in my case 7 days back. Also, i have used cgi to pass parameters in runtime to calculate this shift difference. For example, if i would like to compare today's data with yesterday, then i would pass 1 as the daydelta to the cgi, whcih would calculate the SHIFT values. Then, i have used rrdcgi to render the grpahs in runtime. -- Amzath Ali Rahumathullah &lt;amzatha@<span class="legacy">XYZ-</span>gmail.com&gt;, 2010/10 </div>
+</div>
+   <!-- Optional -->
+<div class="gallery">
+<h2> Mikrotik Wireless Registration Graph </h2>
+<div class="image"><img src="mikrotik_wireless.png" alt="" width="597" height="357" /></div>
+<div class="caption"> This graph shows some important values of wireless connection. -- Tornike Zedginidze &lt;tz@<span class="legacy">XYZ-</span>orient-logic.com&gt;, 2010/4 </div>
+</div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+<div class="gallery">
 <h2>Air Pressure in Almaty</h2>
 <div class="image"><img src="airpres.png" alt="" width="601" height="293" /></div>
 <div class="caption">This site collects live data from air pressure sensor. -- Boris Popov &lt;none&gt;, 2010/11 <a href="http://airpres.kz">[demo]</a></div>
@@ -665,7 +678,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-03/10/11 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+09/14/11 | <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>

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 94004da0a9ea0e89ba67b2c27a372cbc603fa112..28a9ad2ec5d5d0ad4d5df31ec684e8783fab6868 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,8 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "powerusage-2wk.xml"
+#include "PS_Network_traffic.xml"
 #include "nbar_optical_com_pe.xml"
 #include "amz2.xml"
 #include "comp.xml"

diff --git a/website/gallery/powerusage-2wk.png b/website/gallery/powerusage-2wk.png
new file mode 100644 (file)
index 0000000..046fc56
Binary files /dev/null and b/website/gallery/powerusage-2wk.png differ

diff --git a/website/gallery/powerusage-2wk.xml b/website/gallery/powerusage-2wk.xml
new file mode 100644 (file)
index 0000000..2fb5a37
--- /dev/null
+++ b/website/gallery/powerusage-2wk.xml
@@ -0,0 +1,11 @@
+<gallery image="powerusage-2wk.png">\r
+\r
+       <title>2wk Power Usage graph</title>\r
+       <author>Mark Janssen -- sig-io.nl</author>\r
+       <description>kWh usage from my house, measured with an attiny85 and an LDR connected to the kWh meter. Background color signifies high/low tariff. Graph uses various colors for usage level.</description>\r
+       <year>2011</year>\r
+       <month>09</month>\r
+\r
+       <livesite>http://stats.revspace.nl/power/</livesite>\r
+       <email>mark@sig-io.nl</email>\r
+</gallery>\r