[SCM] Debian package checker branch, master, updated. 2.5.11-122-gdc07ecb
The following commit has been merged in the master branch:
commit 8700adfc1971ce713b019abf1cffca9b111bfefa
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jan 27 18:23:32 2013 +0100
r/t/tag.tmpl: Fix "empty <ul>" tag
When tags are emitted with no "extra", replace the "<ul>" supposed to
contain that "extra" with a "<br />". This avoids generating invalid
XHTML, which mandates at least one "<li>" member.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index 61aaa14..b13a6dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -206,6 +206,9 @@ lintian (2.5.12) UNRELEASED; urgency=low
add versioned anchors to them.
* reporting/templates/{index,tag}.tmpl:
+ [JP] Include history graphs in HTML templates.
+ * reporting/templates/tag.tmpl:
+ + [NT] Fix "empty <ul>" tag when tag has no "extra" information.
+ Thanks to Vasudev Kamath for reporting the issue.
-- Niels Thykier <niels@thykier.net> Thu, 13 Dec 2012 13:38:59 +0100
diff --git a/reporting/lintian.css b/reporting/lintian.css
index e4fabea..cc76d01 100644
--- a/reporting/lintian.css
+++ b/reporting/lintian.css
@@ -297,6 +297,11 @@ h2.tag span.type-O {
border: 1px solid #DDD;
}
+br.tag {
+ padding-bottom: 1em;
+}
+
+
/* E/W/I colors */
span.type-I {
diff --git a/reporting/templates/tag.tmpl b/reporting/templates/tag.tmpl
index 01c98be..dcc3dab 100644
--- a/reporting/templates/tag.tmpl
+++ b/reporting/templates/tag.tmpl
@@ -40,9 +40,13 @@
my $overridden = $has_nonoverridden ? '' : qq{ <span class="type-O">overridden</span>};
$OUT .= qq( <h2 class="tag"><a href="../full/$last->{xref}">);
$OUT .= "$last->{package} $last->{version}</a> ($last->{type})$overridden</h2>\n";
- $OUT .= qq( <ul class="tag">\n);
- $OUT .= $tag;
- $OUT .= "</ul>\n";
+ if ($tag) {
+ $OUT .= qq( <ul class="tag">\n);
+ $OUT .= $tag;
+ $OUT .= "</ul>\n";
+ } else {
+ $OUT .= qq(<br class="tag" />\n);
+ }
}
$last = $info;
$tag = '';
@@ -58,8 +62,12 @@
my $overridden = $has_nonoverridden ? '' : qq{ <span class="type-O">overridden</span>};
$OUT .= qq( <h2 class="tag"><a href="../full/$last->{xref}">);
$OUT .= "$last->{package} $last->{version}</a> ($last->{type})$overridden</h2>\n";
- $OUT .= qq( <ul class="tag">\n);
- $OUT .= $tag;
- $OUT .= "</ul>\n";
+ if ($tag) {
+ $OUT .= qq( <ul class="tag">\n);
+ $OUT .= $tag;
+ $OUT .= "</ul>\n";
+ } else {
+ $OUT .= qq(<br class="tag" />\n);
+ }
}
{ foot() }
--
Debian package checker
Reply to: