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

lintian: r1355 - in trunk: debian reporting reporting/images reporting/templates



Author: rra
Date: 2008-06-07 05:32:17 +0200 (Sat, 07 Jun 2008)
New Revision: 1355

Added:
   trunk/reporting/images/
   trunk/reporting/images/ico.png
   trunk/reporting/images/l.png
   trunk/reporting/images/logo-small.png
Modified:
   trunk/debian/changelog
   trunk/reporting/html_reports
   trunk/reporting/lintian.css
   trunk/reporting/templates/clean.tmpl
   trunk/reporting/templates/index.tmpl
   trunk/reporting/templates/maintainer.tmpl
   trunk/reporting/templates/maintainers.tmpl
   trunk/reporting/templates/packages.tmpl
   trunk/reporting/templates/tag.tmpl
   trunk/reporting/templates/tags.tmpl
Log:
* reporting/html_reports:
  + [RA] Copy over images.  Set the maintainer name to "Unknown
    Maintainer" if not known.  Pass the code for a tag into the per-tag
    page.  Based on a patch by Jord?\195?\160 Polo.
* reporting/images/*:
  + [RA] New logo images from Jord?\195?\160 Polo.
* reporting/lintian.css:
  + [RA] Significant overhaul of the lintian.d.o design by Jord?\195?\160 Polo.
* reporting/templates/*:
  + [RA] Significant overhaul of the lintian.d.o design by Jord?\195?\160 Polo.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/debian/changelog	2008-06-07 03:32:17 UTC (rev 1355)
@@ -76,6 +76,16 @@
   * debian/control:
     + [RA] Update standards version to 3.8.0.
   
+  * reporting/html_reports:
+    + [RA] Copy over images.  Set the maintainer name to "Unknown
+      Maintainer" if not known.  Pass the code for a tag into the per-tag
+      page.  Based on a patch by Jordà Polo.
+  * reporting/images/*:
+    + [RA] New logo images from Jordà Polo.
+  * reporting/lintian.css:
+    + [RA] Significant overhaul of the lintian.d.o design by Jordà Polo.
+  * reporting/templates/*:
+    + [RA] Significant overhaul of the lintian.d.o design by Jordà Polo.
   * reporting/templates/clean.tmpl:
     + [FL] Include link to full maintainer report.  Suggested by
       Kartik Mistry.

Modified: trunk/reporting/html_reports
===================================================================
--- trunk/reporting/html_reports	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/html_reports	2008-06-07 03:32:17 UTC (rev 1355)
@@ -108,6 +108,10 @@
     or die "cannot create output directory $HTML_TMP_DIR/tags: $!\n";
 copy("$LINTIAN_ROOT/reporting/lintian.css", "$HTML_TMP_DIR/lintian.css")
     or die "cannot copy lintian.css to $HTML_TMP_DIR: $!\n";
+for my $image (qw/ico.png l.png logo-small.png/) {
+    copy("$LINTIAN_ROOT/reporting/images/$image", "$HTML_TMP_DIR/$image")
+        or die "cannot copy images/$image to $HTML_TMP_DIR: $!\n";
+}
 
 # This variable will accumulate statistics.  For tags: errors, warnings,
 # experimental, overridden, and info are the keys holding the count of tags of
@@ -320,6 +324,7 @@
     # Determine the parts of the maintainer and the file name for the
     # maintainer page.
     my ($name, $email) = ($maintainer =~ /^(.*) <([^>]+)>/);
+    $name = 'Unknown Maintainer' unless $name;
     $email = 'unknown' unless $email;
     my $regular = "maintainer/$id";
     my $full = "full/$id";
@@ -398,6 +403,7 @@
     my %data = (
         description => $description,
         tag         => html_quote ($tag),
+        code        => $by_tag{$tag}[0]->{code},
         tags        => $by_tag{$tag},
         timestamp   => $timestamp,
         version     => $LINTIAN_VERSION

Added: trunk/reporting/images/ico.png
===================================================================
(Binary files differ)


Property changes on: trunk/reporting/images/ico.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/reporting/images/l.png
===================================================================
(Binary files differ)


Property changes on: trunk/reporting/images/l.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/reporting/images/logo-small.png
===================================================================
(Binary files differ)


Property changes on: trunk/reporting/images/logo-small.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: trunk/reporting/lintian.css
===================================================================
--- trunk/reporting/lintian.css	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/lintian.css	2008-06-07 03:32:17 UTC (rev 1355)
@@ -1,9 +1,337 @@
 /* lintian.css -- Style sheet for lintian.debian.org pages. */
 
-h1 {
+/*
+ # Table of Contents:
+ #
+ # 1. General styles (links, lists, titles, tables...)
+ # 2. Header
+ # 3. Navigation
+ # 4. Main content
+ # 5. Footer
+ # 6. Other
+ */
+
+/*
+ # Order:
+ #
+ # example {
+ #   display
+ #   position
+ #   width
+ #   height
+ #   margin
+ #   padding
+ #   background
+ #   color
+ #   font
+ #   text
+ #   line-height
+ #   border
+ # }
+ */
+
+
+/*
+ * 1. General styles
+ */
+
+body {
+    margin: 0;
+    padding: 0;
+    color: #222;
+    font-family: sans-serif;
+}
+
+h1, h2 {
+    font-family: "Junicode", "FreeSerif", serif;
+}
+
+h2 {
+    margin-bottom: 14px;
+    padding-bottom: 6px;
+    border-bottom: 2px solid #AAA;
+}
+
+h3 {
+    margin: 5px 0 5px 10px;
+    color: #444;
+    font-size: 1.0em;
+}
+
+p {
+    line-height: 1.4em;
+}
+
+a {
+    color: #3252B2;
+}
+
+ul {
+    margin: 0;
+}
+
+li {
+    color: #333;
+}
+
+hr {
+    display: none;
+}
+
+
+/*
+ * 2. Header title
+ */
+
+#header {
+    margin: 0 0 28px 0;
+    padding: 5px 20px;
+    /* TODO: Needs full path or url... */
+    background: #F3F3F3 url('logo-small.png') no-repeat right;
+    border-bottom: 1px solid #AAA;
+}
+
+#header p {
+    float: left;
+    margin: 5px 0;
+    color: #444;
+    font-size: 1.0em;
+    font-family: sans-serif;
+    font-weight: bold;
+}
+
+#header p a {
+    color: #444;
+    text-decoration: none;
+}
+
+
+/*
+ * 3. Navigation bar
+ */
+
+#nav {
+    float: right;
+    margin: 5px 55px 5px 0;
+    padding: 0;
+}
+
+#nav li {
+    display: inline;
+    margin-left: 5px;
+}
+
+#nav a {
+    padding: 3px 5px;
+    color: #333;
+    font-size: 0.9em;
+    text-decoration: none;
+}
+
+#nav a:hover {
+    background-color: #FBFBFB;
+    border-bottom: 2px solid #D70751;
+}
+
+
+/*
+ * 4. Main content
+ */
+
+#main {
+    margin: 0 25px;
+    font-size: 0.9em;
+    line-height: 1.4em;
+}
+
+/* Front page */
+
+#logo {
     text-align: center;
 }
 
-div.footer {
-    font-size: smaller;
+#index h2, #stats h2 {
+    margin: 1.4em 0 0.4em 0;
+    border: none;
 }
+
+#info {
+    margin: 25px 0;
+    padding: 20px;
+    background: #EFF4F8 url(l.png) no-repeat left;
+    border: 1px solid #DFE4E8;
+}
+
+#info p {
+    margin-left: 130px;
+}
+
+#stats table {
+    border-collapse: collapse;
+}
+
+#stats table tr td {
+    padding: 3px 5px;
+    background-color: #FDFDFD;
+    border: 1px solid #CCC;
+}
+
+#stats td span {
+    margin: 0 3px 0 0;
+    padding: 1px 3px;
+    font-family: monospace;
+}
+
+/* Maintainer reports */
+
+#summary {
+    font-size: 0.9em;
+}
+
+#summary p {
+    margin-top: 5px;
+    font-size: 0.95em;
+}
+
+#summary ul {
+    padding-left: 20px;
+}
+
+ul.report {
+    padding-left: 20px;
+    padding-bottom: 1em;
+}
+
+ul.tag {
+    padding-bottom: 1em;
+}
+
+ul.report li {
+    padding-left: 5px;
+    padding-bottom: 6px;
+    list-style: none;
+}
+
+ul.tag li {
+    list-style: square;
+}
+
+li span {
+    margin: 0 3px 0 0;
+    padding: 1px 3px;
+    font-family: monospace;
+}
+
+h1 span {
+    padding: 1px 5px;
+    font-family: monospace;
+    font-size: 0.85em;
+    font-weight: normal;
+}
+
+ul.extra {
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
+
+ul.report li ul.extra li {
+    padding-left: 0;
+    padding-bottom: 1px;
+    color: #444;
+    list-style: square;
+}
+
+/* Tag type */
+
+h2.tag {
+    margin: 5px 0;
+    padding: 0;
+    color: #444;
+    font-family: sans-serif;
+    font-size: 1.0em;
+    font-weight: normal;
+    border: none;
+}
+
+h2.tag a {
+    font-weight: bold;
+}
+
+/* E/W/I colors */
+
+span.type-I {
+    color: #111;
+    background-color: #C7EA3C;
+}
+
+span.type-W {
+    color: #111;
+    background-color: #FFEB44;
+}
+
+span.type-E {
+    color: #111;
+    background-color: #FF6700;
+}
+
+span.type-X {
+    color: #111;
+    background-color: #EE99EE;
+}
+
+span.type-O {
+    color: #111;
+    background-color: #DDD;
+}
+
+blockquote {
+    padding: 6px 16px;
+    background-color: #EEE;
+    border: 1px solid #DDD;
+}
+
+blockquote.type-I {
+    background-color: #DFA;
+    border: 1px solid #C7EA3C;
+}
+
+blockquote.type-W {
+    background-color: #FFD;
+    border: 1px solid #FFEB44;
+}
+
+blockquote.type-E {
+    background-color: #FE9;
+    border: 1px solid #FF6700;
+}
+
+blockquote.type-X {
+    background-color: #FECCFE;
+    border: 1px solid #DE66DE;
+}
+
+
+/*
+ * 5. Footer
+ */
+
+#footer {
+    margin: 20px 20px;
+    padding: 10px 0 0 0;
+    font-size: 0.85em;
+    border-top: 1px solid #AAA;
+}
+
+#footer p {
+    margin: 0;
+    padding: 0;
+}
+
+
+/*
+ * 6. Other
+ */
+
+div.clear {
+    clear: both;
+}

Modified: trunk/reporting/templates/clean.tmpl
===================================================================
--- trunk/reporting/templates/clean.tmpl	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/templates/clean.tmpl	2008-06-07 03:32:17 UTC (rev 1355)
@@ -8,11 +8,24 @@
   <title>Lintian Report for {$name}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="../lintian.css" type="text/css" />
+  <link rel="icon" href="../ico.png" type="image/png" />
 </head>
 
 <body>
-  <h1>Lintian Report for {$name}</h1>
 
+<div id="header">
+  <p><a href="../index.html">Lintian Reports</a></p>
+  <ul id="nav">
+    <li><a href="../maintainers.html">Maintainers</a></li>
+    <li><a href="../tags.html">Tags</a></li>
+    <li><a href="../packages_1.html">Packages</a></li>
+  </ul>
+  <div class="clear"></div>
+</div>
+
+<div id="main">
+  <h1>{$name}</h1>
+
   <p>
     All of the packages maintained by {$maintainer} are Lintian-clean.
     But also see the <a href="../full/{$id}">full report</a>, which includes
@@ -24,14 +37,17 @@
     <a href="http://qa.debian.org/developer.php?login={$email}";>QA
     overview</a>.
   </p>
-        
-  <hr />
-  <div class="footer">
-    <p>
-      Please send all comments about these web pages to the
-      <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.<br />
-      Page last updated: {$timestamp} using Lintian {$version}
-    </p>
-  </div>
+</div> <!-- main -->
+
+<hr/>
+
+<div id="footer">
+  <p>
+    Please send all comments about these web pages to the
+    <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.
+  </p>
+  <p>Page last updated: {$timestamp} using Lintian {$version}.</p>
+</div>
+
 </body>
 </html>

Modified: trunk/reporting/templates/index.tmpl
===================================================================
--- trunk/reporting/templates/index.tmpl	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/templates/index.tmpl	2008-06-07 03:32:17 UTC (rev 1355)
@@ -8,83 +8,113 @@
   <title>Lintian</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="lintian.css" type="text/css" />
+  <link rel="icon" href="ico.png" type="image/png" />
 </head>
 
-<body background="bg.gif">
-  <img align="left" src="logo.gif" alt="Lintian" width="300" height="200">
+<body>
 
-  <h1>Lintian</h1>
+<div id="header">
+  <p><a href="index.html">Lintian Reports</a></p>
+  <ul id="nav">
+    <li><a href="maintainers.html">Maintainers</a></li>
+    <li><a href="tags.html">Tags</a></li>
+    <li><a href="packages_1.html">Packages</a></li>
+  </ul>
+  <div class="clear"></div>
+</div>
 
-  <p>
-    Lintian dissects <a href="http://www.debian.org/";>Debian</a>
-    <a href="http://packages.debian.org/";>packages</a> and tries to find
-    bugs and policy violations. It contains automated checks for many
-    aspects of <a href="http://www.debian.org/doc/debian-policy/";>Debian
-    policy</a> as well as some checks for common errors.
-  </p>
+<div id="main">
+  <div id="front">
+    <div id="info">
+      <p>
+        Lintian dissects <a href="http://www.debian.org/";>Debian</a>
+        <a href="http://packages.debian.org/";>packages</a> and tries to find
+        bugs and policy violations. It contains automated checks for many
+        aspects of <a href="http://www.debian.org/doc/debian-policy/";>Debian
+        policy</a> as well as some checks for common errors.
+      </p>
 
-  <p>
-    For more information, see the <a href="manual/index.html">User
-    Manual</a>.
-  </p>
+      <p>
+        For more information, see the <a href="manual/index.html">User
+        Manual</a>.
+      </p>
 
-  <p>
-    Lintian is available in the Debian
-    <a href="http://packages.debian.org/lintian";>lintian package</a>.
-  </p>
+      <p>
+        Lintian is available in the Debian
+        <a href="http://packages.debian.org/lintian";>lintian package</a>.
+      </p>
+    </div> <!-- info -->
+    <div class="clear"></div>
+  </div> <!-- front -->
 
-  <hr />
+  <div id="index">
+    <h2>Indices</h2>
 
-  <p>The following Lintian report indices are available:</p>
+    <ul>
+      <li><a href="reports/maintainers.html">Maintainers</a></li>
+      <li><a href="reports/tags.html">Tag types</a></li>
+      <li>Packages that have names starting with:
+        <ul>
+          <li><a href="reports/packages_1.html">0-9, A-F</a></li>
+          <li><a href="reports/packages_2.html">G-L</a></li>
+          <li><a href="reports/packages_3.html">M-R</a></li>
+          <li><a href="reports/packages_4.html">S-Z</a></li>
+        </ul>
+      </li>
+    </ul>
+  </div> <!-- index -->
 
-  <ul>
-    <li><strong><a href="reports/maintainers.html">Maintainers</a></strong></li>
-    <li><strong><a href="reports/tags.html">Tag types</a></strong></li>
-    <li><strong>Packages that have names starting with:</strong>
-      <ul>
-        <li><a href="reports/packages_1.html">0-9, A-F</a></li>
-        <li><a href="reports/packages_2.html">G-L</a></li>
-        <li><a href="reports/packages_3.html">M-R</a></li>
-        <li><a href="reports/packages_4.html">S-Z</a></li>
-      </ul>
-    </li>
-  </ul>
+  <div id="stats">
+    <h2>Statistics</h2>
+    <table>
+      <tr><td>Last updated:</td>     <td>{$timestamp}</td></tr>
+      <tr><td>Archive timestamp:</td><td>{$mirror}</td></tr>
+      <tr><td>Distribution:</td>     <td>{$dist}</td></tr>
+      <tr><td>Section:</td>          <td>{$section}</td></tr>
+      <tr><td>Architecture:</td>     <td>{$architecture}</td></tr>
+      <tr><td>Maintainers:</td>      <td>{$delta{maintainers}}</td></tr>
+      <tr><td>Source packages:</td>  <td>{$delta{'source-packages'}}</td></tr>
+      <tr><td>Binary packages:</td>  <td>{$delta{'binary-packages'}}</td></tr>
+      <tr><td>&mu;deb packages:</td> <td>{$delta{'udeb-packages'}}</td></tr>
+      <tr>
+        <td><span class="type-E">E</span> Errors:</td>
+        <td>{$delta{errors}}</td>
+      </tr>
+      <tr>
+        <td><span class="type-W">W</span> Warnings:</td>
+        <td>{$delta{warnings}}</td>
+      </tr>
+      <tr>
+        <td><span class="type-I">I</span> Info tags:</td>
+        <td>{$delta{info}}</td>
+      </tr>
+      <tr>
+        <td><span class="type-O">O</span> Overridden tags:</td>
+        <td>{$delta{overridden}}</td>
+      </tr>
+      <tr>
+        <td><span class="type-X">X</span> Experimental tags:</td>
+        <td>{$delta{experimental}}</td>
+      </tr>
+      <tr><td>Lintian version:</td>  <td>{$version}</td></tr>
+    </table>
 
-  <dl>
-    <dt>Statistics:</dt>
-    <dd>
-      <table>
-        <tr><td>Last updated:</td>     <td>{$timestamp}</td></tr>
-        <tr><td>Archive timestamp:</td><td>{$mirror}</td></tr>
-        <tr><td>Distribution:</td>     <td>{$dist}</td></tr>
-        <tr><td>Section:</td>          <td>{$section}</td></tr>
-        <tr><td>Architecture:</td>     <td>{$architecture}</td></tr>
-        <tr><td>Maintainers:</td>      <td>{$delta{maintainers}}</td></tr>
-        <tr><td>Source packages:</td>  <td>{$delta{'source-packages'}}</td></tr>
-        <tr><td>Binary packages:</td>  <td>{$delta{'binary-packages'}}</td></tr>
-        <tr><td>&mu;deb packages:</td>    <td>{$delta{'udeb-packages'}}</td></tr>
-        <tr><td>Warnings:</td>         <td>{$delta{warnings}}</td></tr>
-        <tr><td>Errors:</td>           <td>{$delta{errors}}</td></tr>
-        <tr><td>Info tags:</td>        <td>{$delta{info}}</td></tr>
-        <tr><td>Overridden tags:</td>  <td>{$delta{overridden}}</td></tr>
-        <tr><td>Experimental tags:</td><td>{$delta{experimental}}</td></tr>
-        <tr><td>Lintian version:</td>  <td>{$version}</td></tr>
-      </table>
-    </dd>
-  </dl>
+    <p>
+      (The numbers in parentheses describe the changes since the last Lintian
+      report, published on {$previous}).
+    </p>
+  </div> <!-- stats -->
+</div> <!-- main -->
 
+<hr/>
+
+<div id="footer">
   <p>
-    (The numbers in parentheses describe the changes since the last Lintian
-    report, published on {$previous}).
+    Please send all comments about these web pages to the
+    <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.
   </p>
+  <p>Page last updated: {$timestamp} using Lintian {$version}.</p>
+</div>
 
-  <hr />
-  <div class="footer">
-    <p>
-      Please send all comments about these web pages to the
-      <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.<br />
-      Page last updated: {$timestamp} using Lintian {$version}
-    </p>
-  </div>
 </body>
 </html>

Modified: trunk/reporting/templates/maintainer.tmpl
===================================================================
--- trunk/reporting/templates/maintainer.tmpl	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/templates/maintainer.tmpl	2008-06-07 03:32:17 UTC (rev 1355)
@@ -8,16 +8,29 @@
   <title>Lintian Report for {$name}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="../lintian.css" type="text/css" />
+  <link rel="icon" href="../ico.png" type="image/png" />
 </head>
 
 <body>
-  <h1>Lintian Report for {$name}</h1>
 
+<div id="header">
+  <p><a href="../index.html">Lintian Reports</a></p>
+  <ul id="nav">
+    <li><a href="../maintainers.html">Maintainers</a></li>
+    <li><a href="../tags.html">Tags</a></li>
+    <li><a href="../packages_1.html">Packages</a></li>
+  </ul>
+  <div class="clear"></div>
+</div>
+
+<div id="main">
+  <h1>{$name}</h1>
+
   <p>
     At the time of the last Lintian run, the following possible problems
     were found in packages maintained by {$maintainer}, listed by source
     package.
-{ 
+{
     if ($errors) {
         qq(    See also the <a href="../full/$id">full report</a>, including)
            . " info and overridden tags.";
@@ -26,21 +39,31 @@
            . " only errors and warnings</a>.";
     }
 }
-  </p>
-
-  <p>
     Also see their
     <a href="http://qa.debian.org/developer.php?login={$email}";>QA
     overview</a>.
   </p>
 
-  <dl>
 {
-    # We get a hash of package names to a hash of versions to a list of
-    # tags.  Create a description list with the package information as the
-    # title and the tags as the value.
+    # Show the summary only if the number of packages is within a certain
+    # range.
+    my $num_packages = length(%packages);
+    if ($num_packages > 1 and $num_packages < 20) {
+        $OUT .= qq(  <div id="summary">\n    <ul>\n);
+        foreach $source (keys (%packages)) {
+            $OUT .= qq(      <li><a href="#$source">$source</a></li>\n);
+        }
+        $OUT .= "    </ul>\n  </div>\n";
+    }
+}
+  <div class="clear"></div>
+
+{
+    # We get a hash of package names to a hash of versions to a list of tags.
+    # Create a list with the package information as the title and the tags as
+    # the value.
     for my $source (sort (keys (%packages), keys (%uploads))) {
-        my ($anchored, $data, $upload);
+        my ($data, $upload);
         if ($packages{$source}) {
             $data = $packages{$source};
         } else {
@@ -49,51 +72,64 @@
         }
         for my $version (sort keys %$data) {
             my $tags = $data->{$version};
-            my $last = '';
+            my $first = 1;
+            my $binary = '';
+            my $tag = '';
             for my $info (@$tags) {
                 if ($errors) {
                     next unless $info->{code} eq 'E' or $info->{code} eq 'W';
                 }
-                unless ($last) {
-                    if ($anchored) {
-                        $OUT .= qq(    <dt>);
-                    } else {
-                        $OUT .= qq(    <dt id="$source"><a name="$source">);
-                    }
-                    $OUT .= "<strong>$source ($version)";
-                    $OUT .= ' (Uploader)' if $upload;
-                    $OUT .= '</strong>';
-                    if ($anchored) {
-                        $OUT .= qq(</dt>\n    <dd>\n);
-                    } else {
-                        $OUT .= qq(</a></dt>\n    <dd>\n);
-                        $anchored = 1;
-                    }
+
+                my $is_binary = $info->{type} eq "binary";
+                my $new_binary = $info->{package} ne $binary if $is_binary;
+
+                if ($first) {
+                    $OUT .= qq(  <h2 id="$source">);
+                    $OUT .= "$source ($version)";
+                    $OUT .= " [Uploader]" if $upload;
+                    $OUT .= "</h2>\n";
+                    $OUT .= qq(  <ul class="report">\n) unless $is_binary;
                 }
-                my $id = "$info->{package} $info->{type}";
-                my $tag = qq(<a href="../tags/$info->{tag}.html">)
-                    . $info->{tag} . '</a>';
-                if ($id ne $last) {
-                    if ($last) {
-                        $OUT .= "</pre>\n\n";
-                    }
-                    $OUT .= "      <pre>\n";
+
+                if ($new_binary) {
+                    $OUT .= "</ul>\n    </li>\n  </ul>\n" unless $first;
+                    $OUT .= qq(  <h3>$info->{package}</h3>\n);
+                    $OUT .= qq(  <ul class="report">\n);
                 }
-                $last = $id;
-                $OUT .= "$info->{code}: $id: $tag $info->{extra}\n";
+
+                # Display tag name only once.
+                if ($tag ne $info->{tag}) {
+                    $OUT .= "</ul>\n    </li>\n" unless $first or $new_binary;
+                    $OUT .= "    <li>\n";
+                    $OUT .= qq(      <span class="type-$info->{code}">);
+                    $OUT .= "$info->{code}</span> ";
+                    $OUT .= qq(<a href="../tags/$info->{tag}.html">);
+                    $OUT .= "$info->{tag}</a>\n";
+                    $OUT .= qq(      <ul class="extra">);
+                }
+
+                if ($info->{extra}) {
+                    $OUT .= "<li>$info->{extra}</li>";
+                }
+
+                $first = 0;
+                $binary = $info->{package};
+                $tag = $info->{tag};
             }
-            $OUT .= "</pre>\n    </dd>\n";
+            $OUT .= "</ul>\n    </li>\n  </ul>\n";
         }
     }
-}  </dl>
-        
-  <hr />
-  <div class="footer">
-    <p>
-      Please send all comments about these web pages to the
-      <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.<br />
-      Page last updated: {$timestamp} using Lintian {$version}
-    </p>
-  </div>
+}</div> <!-- main -->
+
+<hr/>
+
+<div id="footer">
+  <p>
+    Please send all comments about these web pages to the
+    <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.
+  </p>
+  <p>Page last updated: {$timestamp} using Lintian {$version}.</p>
+</div>
+
 </body>
 </html>

Modified: trunk/reporting/templates/maintainers.tmpl
===================================================================
--- trunk/reporting/templates/maintainers.tmpl	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/templates/maintainers.tmpl	2008-06-07 03:32:17 UTC (rev 1355)
@@ -5,14 +5,27 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
 <head>
-  <title>Lintian Report by Maintainer</title>
+  <title>Lintian Reports by Maintainer</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="lintian.css" type="text/css" />
+  <link rel="icon" href="ico.png" type="image/png" />
 </head>
 
 <body>
-  <h1>Lintian Report by Maintainer</h1>
 
+<div id="header">
+  <p><a href="index.html">Lintian Reports</a></p>
+  <ul id="nav">
+    <li><a href="maintainers.html">Maintainers</a></li>
+    <li><a href="tags.html">Tags</a></li>
+    <li><a href="packages_1.html">Packages</a></li>
+  </ul>
+  <div class="clear"></div>
+</div>
+
+<div id="main">
+  <h1>Maintainers</h1>
+
   <p>
     Maintainers are listed sorted case-insensitively by package maintainer
     string.  This is an unsophisticated sort that doesn't take into
@@ -53,14 +66,17 @@
             . qq{ (<a href="full/$url">full report</a>)<br />\n};
     }
 }  </p>
-        
-  <hr />
-  <div class="footer">
-    <p>
-      Please send all comments about these web pages to the
-      <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.<br />
-      Page last updated: {$timestamp} using Lintian {$version}
-    </p>
-  </div>
+</div> <!-- main -->
+
+<hr/>
+
+<div id="footer">
+  <p>
+    Please send all comments about these web pages to the
+    <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.
+  </p>
+  <p>Page last updated: {$timestamp} using Lintian {$version}.</p>
+</div>
+
 </body>
 </html>

Modified: trunk/reporting/templates/packages.tmpl
===================================================================
--- trunk/reporting/templates/packages.tmpl	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/templates/packages.tmpl	2008-06-07 03:32:17 UTC (rev 1355)
@@ -5,14 +5,27 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
 <head>
-  <title>Lintian Reports Package Index: {$section}</title>
+  <title>Lintian Package Index: {$section}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="lintian.css" type="text/css" />
+  <link rel="icon" href="ico.png" type="image/png" />
 </head>
 
 <body>
-  <h1>Lintian Reports Package Index: {$section}</h1>
 
+<div id="header">
+  <p><a href="index.html">Lintian Reports</a></p>
+  <ul id="nav">
+    <li><a href="maintainers.html">Maintainers</a></li>
+    <li><a href="tags.html">Tags</a></li>
+    <li><a href="packages_1.html">Packages</a></li>
+  </ul>
+  <div class="clear"></div>
+</div>
+
+<div id="main">
+  <h1>Package Index: {$section}</h1>
+
   <p>
     This is a list of all source or binary packages that have at least one
     lintian tag.  This includes all tags, even experimental and info tags
@@ -41,14 +54,17 @@
         $OUT .= qq(    <a href="full/$packages{$package}">$package</a>\n);
     }
 }  </p>
-        
-  <hr />
-  <div class="footer">
-    <p>
-      Please send all comments about these web pages to the
-      <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.<br />
-      Page last updated: {$timestamp} using Lintian {$version}
-    </p>
-  </div>
+</div> <!-- main -->
+
+<hr/>
+
+<div id="footer">
+  <p>
+    Please send all comments about these web pages to the
+    <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.
+  </p>
+  <p>Page last updated: {$timestamp} using Lintian {$version}.</p>
+</div>
+
 </body>
 </html>

Modified: trunk/reporting/templates/tag.tmpl
===================================================================
--- trunk/reporting/templates/tag.tmpl	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/templates/tag.tmpl	2008-06-07 03:32:17 UTC (rev 1355)
@@ -5,20 +5,33 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
 <head>
-  <title>Lintian Tag {$tag}</title>
+  <title>Lintian Tag: {$tag}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="../lintian.css" type="text/css" />
+  <link rel="icon" href="../ico.png" type="image/png" />
 </head>
 
 <body>
-  <h1>Lintian Tag {$tag}</h1>
 
+<div id="header">
+  <p><a href="../index.html">Lintian Reports</a></p>
+  <ul id="nav">
+    <li><a href="../maintainers.html">Maintainers</a></li>
+    <li><a href="../tags.html">Tags</a></li>
+    <li><a href="../packages_1.html">Packages</a></li>
+  </ul>
+  <div class="clear"></div>
+</div>
+
+<div id="main">
+  <h1><span class="type-{$code}">{$code}</span> {$tag}</h1>
+
   <p>
-    All reports of {$tag} for the archive.  The extended description of
-    this tag is:
+    All reports of {$tag} for the archive. The extended description of this
+    tag is:
   </p>
 
-  <blockquote>
+  <blockquote class="type-{$code}">
 {$description}
   </blockquote>
 
@@ -28,8 +41,7 @@
     maintainer report page, which includes info and experimental tags and
     overridden tags, rather than the default page that shows only errors
     and warnings.
-  </p>
-
+  </p> 
 {
     # We get a list of tag data.  We create a separate paragraph for each
     # package name.
@@ -37,23 +49,26 @@
     for my $info (sort { $a->{package} cmp $b->{package} } @tags) {
         my $id = "$info->{package} $info->{type}";
         if ($id ne $last) {
-            $OUT .= "</pre>\n" if $last;
-            $OUT .= qq(  <pre class="tags">\n);
+            $OUT .= "</ul>\n" if $last;
+            $OUT .= qq(  <h2 class="tag"><a href="../full/$info->{xref}">);
+            $OUT .= "$info->{package}</a> ($info->{type})</h2>\n";
+            $OUT .= qq(  <ul class="tag">\n);
             $last = $id;
         }
-        $id = qq(<a href="../full/$info->{xref}">$id</a>);
-        $OUT .= "$info->{code}: $id: $info->{tag} $info->{extra}\n";
+        $OUT .= "<li>$info->{extra}</li>\n" if $info->{extra};
     }
-    $OUT .= '</pre>';
-}
-        
-  <hr />
-  <div class="footer">
-    <p>
-      Please send all comments about these web pages to the
-      <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.<br />
-      Page last updated: {$timestamp} using Lintian {$version}
-    </p>
-  </div>
+    $OUT .= "  </ul>\n";
+}</div> <!-- main -->
+
+<hr/>
+
+<div id="footer">
+  <p>
+    Please send all comments about these web pages to the
+    <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.
+  </p>
+  <p>Page last updated: {$timestamp} using Lintian {$version}.</p>
+</div>
+
 </body>
 </html>

Modified: trunk/reporting/templates/tags.tmpl
===================================================================
--- trunk/reporting/templates/tags.tmpl	2008-06-07 00:49:18 UTC (rev 1354)
+++ trunk/reporting/templates/tags.tmpl	2008-06-07 03:32:17 UTC (rev 1355)
@@ -8,22 +8,35 @@
   <title>Lintian Tags</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="lintian.css" type="text/css" />
+  <link rel="icon" href="ico.png" type="image/png" />
 </head>
 
 <body>
-  <h1>Lintian Tags</h1>
 
+<div id="header">
+  <p><a href="index.html">Lintian Reports</a></p>
+  <ul id="nav">
+    <li><a href="maintainers.html">Maintainers</a></li>
+    <li><a href="tags.html">Tags</a></li>
+    <li><a href="packages_1.html">Packages</a></li>
+  </ul>
+  <div class="clear"></div>
+</div>
+
+<div id="main">
+  <h1>Tags</h1>
+
   <p>
     This is a list of all tags that occur at least once in the archive
     with their frequency counts.  This includes all tags, even
     experimental and info tags.
   </p>
 
-  <p>
+  <ul>
 {
     for my $tag (sort keys %tags) {
         my ($count, $overrides) = (0, 0);
-	my %seen;
+        my %seen;
         for my $info (@{ $tags{$tag} }) {
             if ($info->{code} eq 'O') {
                 $overrides++;
@@ -33,19 +46,22 @@
             }
         }
         my $packages = scalar keys %seen;
-        $OUT .= qq(    <a href="tags/$tag.html">$tag</a>)
+        $OUT .= qq(    <li><a href="tags/$tag.html">$tag</a>)
             . " ($packages packages, $count tags, plus $overrides overrides)"
-            . "<br />\n";
+            . "</li>\n";
     }
-}  </p>
-        
-  <hr />
-  <div class="footer">
-    <p>
-      Please send all comments about these web pages to the
-      <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.<br />
-      Page last updated: {$timestamp} using Lintian {$version}
-    </p>
-  </div>
+}  </ul>
+</div> <!-- main -->
+
+<hr/>
+
+<div id="footer">
+  <p>
+    Please send all comments about these web pages to the
+    <a href="mailto:lintian-maint@debian.org";>Lintian maintainers</a>.
+  </p>
+  <p>Page last updated: {$timestamp} using Lintian {$version}.</p>
+</div>
+
 </body>
 </html>


Reply to: