[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.11-29-gce7bbee



The following commit has been merged in the master branch:
commit 96e3ff6bfb8f740f8ff33ede234847c38e5f1c7f
Author: Jordà Polo <jorda@ettin.org>
Date:   Thu Dec 27 18:46:38 2012 +0100

    Include history graphs in HTML templates
    
    * reporting/html_reports:
      + [JP] Pass graph variables to index and tag templates.
    * reporting/lintian.css:
      + [JP] Tweak graph alignment
    * reporting/templates/{index,tag}.tmpl:
      + [JP] Include history graphs in HTML templates.

diff --git a/debian/changelog b/debian/changelog
index 47da92c..595b48d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,9 +52,14 @@ lintian (2.5.12) UNRELEASED; urgency=low
       RewriteMap.  (Closes: #696960)
     + [JP] Fix version labels glitches.
     + [JP] Use global $GRAPHS_RANGE_DAYS.
+    + [JP] Pass graph variables to index and tag templates.
+  * reporting/lintian.css:
+    + [JP] Tweak graph alignment.
   * reporting/templates/{packages,maintainer,tag}.tmpl:
     + [NT] Properly handle multiple versions of the same source and
       add versioned anchors to them.
+  * reporting/templates/{index,tag}.tmpl:
+    + [JP] Include history graphs in HTML templates.
 
  -- Niels Thykier <niels@thykier.net>  Thu, 13 Dec 2012 13:38:59 +0100
 
diff --git a/reporting/html_reports b/reporting/html_reports
index 3e78c54..a5eb229 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -498,6 +498,8 @@ for my $tag (sort $profile->tags (1)) {
         tag         => html_quote ($tag),
         code        => $info->code,
         tags        => $by_tag{$tag},
+        graphs      => $GRAPHS,
+        graphs_days => $GRAPHS_RANGE_DAYS,
     );
     output_template ("tags/$tag.html", $templates{$tmpl}, \%maint_data);
 }
@@ -574,6 +576,8 @@ close STATS or die "cannot write to $statistics_file: $!\n";
     mirror       => $mirror_timestamp,
     previous     => $old_statistics->{'last-updated'},
     area         => join(', ', split(/\s*,\s*/, $LINTIAN_AREA)),
+    graphs       => $GRAPHS,
+    graphs_days  => $GRAPHS_RANGE_DAYS,
 );
 output_template ('index.html', $templates{index}, \%data);
 
diff --git a/reporting/lintian.css b/reporting/lintian.css
index 08f29f5..e4fabea 100644
--- a/reporting/lintian.css
+++ b/reporting/lintian.css
@@ -183,6 +183,10 @@ hr {
     font-family: monospace;
 }
 
+#stats div.graph {
+    text-align: left;
+}
+
 /* Maintainer reports */
 
 #summary {
@@ -203,6 +207,10 @@ ul.report {
     padding-bottom: 1em;
 }
 
+div.graph {
+    text-align: center;
+}
+
 ul.tag {
     padding-bottom: 1em;
 }
diff --git a/reporting/templates/index.tmpl b/reporting/templates/index.tmpl
index 43ea7f4..3bc5006 100644
--- a/reporting/templates/index.tmpl
+++ b/reporting/templates/index.tmpl
@@ -85,5 +85,18 @@
       (The numbers in parentheses describe the changes since the last Lintian
       report, published on {$previous}.)
     </p>
+
+{
+    if ($graphs) {
+        $OUT .= qq(  <p>\n);
+        $OUT .= qq(    Evolution of Lintian tags over the past\n);
+        $OUT .= qq(    $graphs_days days: <div class="graph"><img\n);
+        $OUT .= qq(    src="graphs/statistics.svg" alt="History of Lintian\n);
+        $OUT .= qq(    tags" /></div>\n);
+        $OUT .= qq(  </p>);
+    }
+    '';
+}
+
   </div> <!-- stats -->
 { foot() }
diff --git a/reporting/templates/tag.tmpl b/reporting/templates/tag.tmpl
index a3a686b..01c98be 100644
--- a/reporting/templates/tag.tmpl
+++ b/reporting/templates/tag.tmpl
@@ -10,6 +10,18 @@
 {$description}
   </blockquote>
 
+{
+    if ($graphs) {
+        $OUT .= qq(  <p>\n);
+        $OUT .= qq(    Evolution of the $tag Lintian tag over the past\n);
+        $OUT .= qq(    $graphs_days days: <div class="graph"><img\n);
+        $OUT .= qq(    src="../graphs/tags/$tag.svg" alt="History of $tag"\n);
+        $OUT .= qq(    /></div>\n);
+        $OUT .= qq(  </p>);
+    }
+    '';
+}
+
   <p>
     The package names link to the relevant maintainer page and the
     corresponding report for the source package.  The links go to the full

-- 
Debian package checker


Reply to: