Merge Thomas branch to change NEWs layout

[dak.git] / dak / show_new.py
diff --git a/dak/show_new.py b/dak/show_new.py

old mode 100755 (executable)

new mode 100644 (file)

index a35f4d6..2596f86
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -29,7 +29,7 @@ import copy, os, sys, time
  import apt_pkg
  import examine_package
  import daklib.database
-import daklib.queue 
+import daklib.queue
  import daklib.utils
  
  # Globals
@@ -53,7 +53,7 @@ def html_header(name, filestoexamine):
      <meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8"
      />
      <title>%(name)s - Debian NEW package overview</title>
-    <link type="text/css" rel="stylesheet" href="style.css" />
+    <link type="text/css" rel="stylesheet" href="/style.css" />
      <link rel="shortcut icon" href="http://www.debian.org/favicon.ico" />
      <script type="text/javascript">
        //<![CDATA[
@@ -79,7 +79,7 @@ def html_header(name, filestoexamine):
        //]]>
      </script>
    </head>
-  <body>
+  <body id="NEW-details-page">
      <div id="logo">
        <a href="http://www.debian.org/">
          <img src="http://www.debian.org/logos/openlogo-nd-50.png"
@@ -89,7 +89,6 @@ def html_header(name, filestoexamine):
          alt="Debian Project" /></a>
      </div>
      <div id="titleblock">
-
        <img src="http://www.debian.org/Pics/red-upperleft.png"
        id="red-upperleft" alt="corner image"/>
        <img src="http://www.debian.org/Pics/red-lowerleft.png"
@@ -113,17 +112,17 @@ def html_header(name, filestoexamine):
        <p><a href="#source-lintian" onclick="show('source-lintian-body')">source lintian</a></p>
        """
      for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine):
-      packagename = fn.split('_')[0]
-      print """
-      <p class="subtitle">%(pkg)s</p>
-      <p><a href="#binary-%(pkg)s-control" onclick="show('binary-%(pkg)s-control-body')">control file</a></p>
-      <p><a href="#binary-%(pkg)s-lintian" onclick="show('binary-%(pkg)s-lintian-body')">binary lintian</a></p>
-      <p><a href="#binary-%(pkg)s-contents" onclick="show('binary-%(pkg)s-contents-body')">.deb contents</a></p>
-      <p><a href="#binary-%(pkg)s-copyright" onclick="show('binary-%(pkg)s-copyright-body')">copyright</a></p>
-      <p><a href="#binary-%(pkg)s-file-listing" onclick="show('binary-%(pkg)s-file-listing-body')">file listing</a></p>
-      """%{"pkg":packagename}
+        packagename = fn.split('_')[0]
+        print """
+        <p class="subtitle">%(pkg)s</p>
+        <p><a href="#binary-%(pkg)s-control" onclick="show('binary-%(pkg)s-control-body')">control file</a></p>
+        <p><a href="#binary-%(pkg)s-lintian" onclick="show('binary-%(pkg)s-lintian-body')">binary lintian</a></p>
+        <p><a href="#binary-%(pkg)s-contents" onclick="show('binary-%(pkg)s-contents-body')">.deb contents</a></p>
+        <p><a href="#binary-%(pkg)s-copyright" onclick="show('binary-%(pkg)s-copyright-body')">copyright</a></p>
+        <p><a href="#binary-%(pkg)s-file-listing" onclick="show('binary-%(pkg)s-file-listing-body')">file listing</a></p>
+        """%{"pkg":packagename}
      print "    </div>"
-   
+
  def html_footer():
      print """    <p class="validate">Timestamp: %s (UTC)</p>"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
      print """    <p><a href="http://validator.w3.org/check?uri=referer">