[tokkee]

tokkee.org

Code

projects / pkg-collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec75497)
patches: Added bts575029-collectd2html-xhtml.
authorSebastian Harl <sh@tokkee.org>
Thu, 3 Jun 2010 14:32:43 +0000 (16:32 +0200)
committerSebastian Harl <sh@tokkee.org>
Thu, 3 Jun 2010 14:32:43 +0000 (16:32 +0200)
… adding support for XHTML to collectd2html.pl.

Thanks to Ivan Shmakov for reporting this and Max Henkel and Timur Kirilichev
for providing patches!

Closes: #575029
debian/changelog patch | blob | history
debian/patches/00list patch | blob | history
debian/patches/bts575029-collectd2html-xhtml.dpatch [new file with mode: 0755] patch | blob

diff --git a/debian/changelog b/debian/changelog
index 80a479bad513414f80cc8b8082a5842156e1fb88..3f7a0373dbdad9f47927552a7b32a65cf3a4ae16 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,12 +12,15 @@ collectd (4.10.0-1) unstable; urgency=low
   * debian/patches:
     - Removed bts566199_collection_hide_types -- applied upstream.
     - Removed typo_fixes -- applied upstream.
+    - Added bts575029-collectd2html-xhtml, adding support for XHTML to
+      collectd2html.pl; thanks to Ivan Shmakov for reporting this and Max
+      Henkel and Timur Kirilichev for providing patches (Closes: #575029).
   * debian/rules:
     - Define (and pass to configure) $JAR.
     - Added support for Renesas SH4 to the Java arch mapping; thanks to
       Nobuhiro Iwamatsu for the patch (Closes: #564165).
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 03 Jun 2010 15:22:13 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 03 Jun 2010 16:31:02 +0200
 
 collectd (4.9.1-2) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index c3fbc669cff660a94d434366b72ac79e8afdbc49..2ba95f8b3da8b57881638e77f7696bb87ccfb11e 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,4 +3,5 @@ collection_conf_path.dpatch
 bts561577_collectd2html_recursive_fix.dpatch
 bts557599_powerdns_fix.dpatch
 bts559801_plugin_find_fix.dpatch
+bts575029-collectd2html-xhtml.dpatch
 
diff --git a/debian/patches/bts575029-collectd2html-xhtml.dpatch b/debian/patches/bts575029-collectd2html-xhtml.dpatch
new file mode 100755 (executable)
index 0000000..5481b88
--- /dev/null
+++ b/debian/patches/bts575029-collectd2html-xhtml.dpatch
@@ -0,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts575029-collectd2html-xhtml.dpatch by Max Henkel <henkel@gmx.at> and
+## Timur Kirilichev <dontstay@pochta.ru>
+##
+## DP: collectd2html.pl: Added support for XHTML.
+
+@DPATCH@
+
+diff a/contrib/collectd2html.pl b/contrib/collectd2html.pl
+--- a/contrib/collectd2html.pl
++++ b/contrib/collectd2html.pl
+@@ -68,7 +68,7 @@ $HOST = $tmp[0] if (! defined $HOST);
+ my $svg_p = ($IMG_FMT eq "SVG");
+ my $IMG_SFX = $svg_p ? ".svg" : ".png";
+ my $IMG_DIR = "${HOST}.dir";
+-my $HTML = "${HOST}.html";
++my $HTML = "${HOST}.xhtml";
+ 
+ ################################################################################
+ #
+@@ -118,14 +118,20 @@ open(OUT, ">$HTML");
+ my $title="Rrd plot for $HOST";
+ 
+ print OUT <<END;
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+-   "http://www.w3.org/TR/html4/loose.dtd">
+-<html>
++<!DOCTYPE html PUBLIC
++  "-//W3C//DTD XHTML 1.1//EN"
++  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
++<style type="text/css" media="screen">
++.graph { text-align: center; }
++object.graph { width: 670; height: 179; }
++</style>
+ <title>$title</title>
++<meta http-equiv="Content-Type"
++      content="application/xhtml+xml; charset=us-ascii" />
+ </head>
+ <body>
+-<center>
+ END
+ 
+ # list interesting rrd
+@@ -148,20 +154,20 @@ foreach my $rrd (@list){
+ 
+ # table of contents
+ print OUT <<END;
+-<A name="top"></A><H1>$title</H1>
+-<P>
++<h1><a id="top">$title</a></h1>
++<p>
+ END
+ 
+ foreach my $bn (@rrds){
+       my $cleaned_bn = $bn;
+       $cleaned_bn =~ tr/%\//__/;
+       print OUT <<END;
+-<A href="#$cleaned_bn">$bn</A>
++<a href="#$cleaned_bn">$bn</a>
+ END
+ }
+ 
+ print OUT <<END;
+-</P>
++</p>
+ END
+ 
+ # graph interesting rrd
+@@ -206,7 +212,7 @@ for (my $i = 0; $i < scalar(@rrds); ++$i) {
+       my $cleaned_bn = $bn;
+       $cleaned_bn =~ tr/%\//__/;
+       print OUT <<END;
+-<A name="$cleaned_bn"></A><H1>$bn</H1>
++<h2><a id="$cleaned_bn">$bn</a></h2>
+ END
+ 
+       # graph various ranges
+@@ -223,24 +229,28 @@ END
+               my $cleaned_img = $img; $cleaned_img =~ s/%/%25/g;
+               if (! $svg_p) {
+                       print OUT <<END;
+-<P><IMG src="$cleaned_img" alt="${bn} $span"></P>
++<p class="graph"><img src="$cleaned_img" alt="${bn} $span" /></p>
+ END
+               } else {
+                       print OUT <<END;
+-<P><object data="$cleaned_img" type="image/svg+xml"
+-           width="670" height="179">
+-  ${bn} $span</object></P>
++<p class="graph"><object data="$cleaned_img" type="image/svg+xml">
++  ${bn} $span</object></p>
+ END
+               }
+       }
+ 
+       print OUT <<END;
+-<A href="#top">[top]</A>
++<p><a href="#top">[top]</a></p>
+ END
+ }
+ 
+ print OUT <<END;
+-</center>
++<hr />
++<p>
++  <a href="http://validator.w3.org/check?uri=referer"><img
++     src="http://www.w3.org/Icons/valid-xhtml10"
++     alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
++</p>
+ </body>
+ </html>
+ END
Unnamed repository; edit this file 'description' to name the repository.