From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 3 May 2008 17:48:55 +0000 (+0200)
Subject: Another merge from Thomas nicer-new tree
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=13dc30ace62ff39cb4298d8d8ba5457b043c6100;hp=3a9dde4dd4e21e7e706d6e5402c2a2c548b43dc7;p=dak.git

Another merge from Thomas nicer-new tree
---

diff --git a/ChangeLog b/ChangeLog
index 11b30db0..77132d17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 	* web/,web/style.css: add web dir and current style.css
 
 	* dak/examine_package.py, dak/show_new.py: improve NEW html pages,
+	based on mock-up by M. Ferrari.
 	remove Checksums-* from examine-package output
 
 2008-05-03  Thomas Viehmann  <tv@beamnet.de>
diff --git a/dak/examine_package.py b/dak/examine_package.py
index 182ed2d8..b9ac9af3 100644
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -101,7 +101,7 @@ def headline(s, level=2, bodyelement=None):
     if use_html:
         if bodyelement:
             print """<thead>
-                <tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s</th></tr>
+                <tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s <span class="toggle-msg">(click to toggle)</span></th></tr>
               </thead>"""%{"bodyelement":bodyelement,"title":html_escape(s)}
         else:
             print "<h%d>%s</h%d>" % (level, html_escape(s), level)
@@ -368,9 +368,12 @@ def output_deb_info(filename):
         elif key == 'Maintainer':
             field_value = maintainer
         elif key == 'Description':
-            desc = control.Find(key)
-            desc = re_newlinespace.sub('\n ', desc)
-            field_value = escape_if_needed(desc)
+            if use_html:
+                field_value = formatted_text(control.Find(key), strip=True)
+            else:
+                desc = control.Find(key)
+                desc = re_newlinespace.sub('\n ', desc)
+                field_value = escape_if_needed(desc)
         else:
             field_value = escape_if_needed(control.Find(key))
         to_print += " "+format_field(key,field_value)+'\n'
diff --git a/web/style.css b/web/style.css
index c46c8ab6..b942d1b0 100644
--- a/web/style.css
+++ b/web/style.css
@@ -173,6 +173,17 @@ a:hover{
 }
 
 /************* NEW details pages ************/
+
+/* this overides some overly general styles above */
+#NEW-details-page th {
+ background-color: white;
+ padding: 0;
+}
+#NEW-details-page table { 
+ background-color: white;
+ padding: 0;
+}
+
 #NEW-details-page a img {
 	text-decoration: none;
 	border: none;
@@ -198,6 +209,14 @@ a:hover{
 	color: #FFFF00;
 	text-decoration: underline;
 }
+#NEW-details-page #menu a:visited {
+	color: #0000FF;
+	text-decoration: none;
+}
+#NEW-details-page #menu a:hover {
+	color: #0000FF;
+	text-decoration: none;
+}
 #NEW-details-page #red-upperleft {
 	position: absolute;
 	top: 0px;
@@ -224,6 +243,11 @@ a:hover{
 	font-family: serif;
 	font-size: 22px;
 }
+#NEW-details-page .toggle-msg { 
+        font-weight: normal;
+	font-family: serif;
+	font-size: 80%;
+}
 #NEW-details-page #menu {
 	font-size: 80%;
 	position: fixed;
@@ -235,6 +259,7 @@ a:hover{
 }
 #NEW-details-page #menu p {
 	margin: 0px;
+	font-size: 80%;
 }
 #NEW-details-page .infobox {
 	width: 80%;