ftpmaster-dak r1075: Another merge from Thomas nicer-new tree
------------------------------------------------------------
revno: 1075
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Sat 2008-05-03 19:48:55 +0200
message:
Another merge from Thomas nicer-new tree
modified:
ChangeLog
dak/examine_package.py
web/style.css
------------------------------------------------------------
revno: 1055.1.9
committer: Thomas Viehmann <tv@beamnet.de>
branch nick: nicer-new
timestamp: Sat 2008-05-03 17:37:15 +0000
message:
credit Tincho, CSS fixes, show 'click to toggle'
modified:
ChangeLog
dak/examine_package.py
web/style.css
------------------------------------------------------------
revno: 1055.1.10
committer: Thomas Viehmann <tv@beamnet.de>
branch nick: nicer-new
timestamp: Sat 2008-05-03 17:45:16 +0000
message:
formatting of description
modified:
dak/examine_package.py
=== modified file 'ChangeLog'
--- a/ChangeLog 2008-05-03 14:07:49 +0000
+++ b/ChangeLog 2008-05-03 17:48:55 +0000
@@ -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>
=== modified file 'dak/examine_package.py'
--- a/dak/examine_package.py 2008-05-03 10:25:00 +0000
+++ b/dak/examine_package.py 2008-05-03 17:45:16 +0000
@@ -101,7 +101,7 @@
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 @@
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'
=== modified file 'web/style.css'
--- a/web/style.css 2008-05-03 14:01:40 +0000
+++ b/web/style.css 2008-05-03 17:37:15 +0000
@@ -173,6 +173,17 @@
}
/************* 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 @@
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 @@
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 @@
}
#NEW-details-page #menu p {
margin: 0px;
+ font-size: 80%;
}
#NEW-details-page .infobox {
width: 80%;
Reply to: