Try another layout for the "moreinfo" part

diff --git a/static/packages.css.sed.in b/static/packages.css.sed.in
index 082abba78112397ac8701632cb659dd0536b642d..9cfd0c3c987e94381e588f75b1c699876b47db44 100644 (file)
--- a/static/packages.css.sed.in
+++ b/static/packages.css.sed.in
@@ -28,12 +28,21 @@ h1 {
        clear: both;
 }
 
-#pdesc, #ptags, #pdeps, #pdownload, #pmoreinfo {
+#pdesc, #ptags, #pdeps, #pdownload {
        margin-left: 1em;
        margin-right: 1em;
 }
-#pmoreinfo p {
-       font-size: 0.85em;
+#pmoreinfo { 
+             font-size: smaller;
+             margin-left: 1em;
+             float: right;
+             background-color: #BBDDFF;
+             border: thin solid #BFC3DC;
+             padding: 1em .5em;
+             width: auto;
+}
+#pmoreinfo h3 {
+             border-top: thin solid black;
 }
 
 /*
@@ -65,13 +74,8 @@ h1 {
 
 #pdeps ul {
        list-style-type: none;
-       padding-left: 2em;
 }
 
-/* #pdeps li {
-       text-indent: -2em;
-} */
-
 #pdeps ul.uldep, #pdeps ul.uladep {
        list-style-type: disc;
        list-style-image: url(http://%SITE%/Pics/dep.gif);
@@ -87,13 +91,11 @@ h1 {
        list-style-image: url(http://%SITE%/Pics/sug.gif);
 }
 
-#pdeps ul.uldep li, #pdeps ul.ulrec li, #pdeps ul.ulsug li, #pdeps ul.uladep li, #pdeps ul.ulidep li {
-       padding-left: 1em;
-}
 #pdeps dl {
        margin: 0;
 }
 
+
 /*
 
   MESSAGES
@@ -212,7 +214,6 @@ table#pdeplegend, #pdownload table {
        font-family: monospace;
 }
 #pcontentsres td {
-/*     font-size: smaller;*/
        padding: .4em;
 }
 #pcontentsres th {
@@ -315,7 +316,33 @@ table#pdeplegend, #pdownload table {
 #pnavbar a:hover {
 }
 
-#pnavbar, .pconstantnag {
+.p_js_elem { 
+             font-size: smaller;
+}
+
+#psitewidemsg {
+                padding: .25em;
+                text-align: center;
+}
+
+#psitewidemsg.high { 
+                     border: 4px #DF0451 ridge;
+                     background-color: yellow;
+                     color: #DF0451;
+}
+
+#psitewidemsg.normal {
+                       border: dotted thin red;
+}
+
+#psitewidemsg.low {
+                    border: solid thin black;
+}
+
+.pvcslink { 
+}
+
+#pnavbar, .pconstantnag, #psitewidemsg {
        -moz-border-radius: 15px;
        /* this goes to the end as the css validator does not like it
        will be replaced by border-radius with css3 */

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 1a7ca12af399148d4952d9f4c9dbef494448812e..fba7dfe8bb976909620e207a54c9dc2ede5fb3f3 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -44,6 +44,74 @@
 [%- PROCESS marker text=section IF section && section != main_section %]
 [%- PROCESS marker text='essential' IF page.get_newest('essential') == 'yes' %]</h1>
 
+[% UNLESS is_virtual %]
+<div id="pmoreinfo">
+<h2>Links for [% pkg %]</h2>
+<h3>Debian Resources:</h3>
+<ul>
+<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg | uri %]">Bug Reports</a></li>
+
+[% IF src -%]
+<li><a href="[% pts_url _ src.pkg | uri %]">Developer Information (PTS)</a></li>
+[% ELSIF is_source %]
+<li><a href="[% pts_url _ pkg | uri %]">Developer Information (PTS)</a></li>
+[%- END %]
+
+[% IF files %]
+<li><a href="[% changelogs_url _ files.changelog.path %]">Debian Changelog</a></li>
+<li><a href="[% changelogs_url _ files.copyright.path %]">Copyright File</a></li>
+[% END %]
+</ul>
+
+[% #FIXME: should this only be used for the PTS?
+   known_vcs = [ [ 'cvs', 'CVS' ],
+               [ 'svn', 'Subversion' ],
+               [ 'bzr', 'bzr' ],
+               [ 'darcs', 'Darcs'],
+               [ 'arch', 'arch' ] ];
+   FOREACH vcs IN known_vcs;
+       vcs_id = vcs.0; vcs_name = vcs.1;
+       vcs_info = page.get_newest("vcs-$vcs_id");
+       SET vcs_info = page.get_newest("x-vcs-$vcs_id") UNLESS vcs_info;
+       IF vcs_info; %]
+<p>Debian Package Repository (<acronym title="Version Control System">VCS</acronym>: [% vcs_name %]):<br> <a href="[% vcs_info %]" class="pvcslink">[% vcs_info %]</a></p>
+[% END; END %]
+
+[% IF src %]
+  <p>Download Source Package <a href="[% src.url %]">[% src.pkg %]</a>:
+  [% FOREACH src.downloads %]
+    [% '<ul>' IF loop.first %]
+    <li><a href="[% server _ path %]">[[% name %]]</a></li>
+    [% '</ul>' IF loop.last %]
+  [% END %]
+  [% IF src.downloads.size == 0 %]
+  Not found
+  [% END %]
+[% END %]
+
+[% IF maintainers.size == 1 -%]
+  <h3>Maintainer:</h3>
+  [%- FOREACH maintainers -%]
+       <a href="mailto:[% mail %]">[% name | html %]</a>
+  [%- END -%]
+[%- ELSE -%]
+  <h3>Maintainers:</h3>
+  [%- FOREACH maintainers -%]
+    [%- '<ul>' IF loop.first -%]
+       <li><a href="mailto:[% mail %]">[% name | html %]</a></li>
+    [%- '</ul>' IF loop.last -%]
+  [%- END -%]
+[%- END %]
+
+[% url = page.get_newest('url');
+   IF url %]
+<h3>External Resources:</h3>
+<p>Homepage: <a href="[% url | uri %]">[% url | html %]</a></p>
+[% END %]
+
+</div> <!-- end pmoreinfo -->
+[% END %]
+
 [% IF suite == "experimental" || subsection == "debian-installer" %]
 <div class="pconstantnag">
 [% IF suite == "experimental" %]
@@ -199,67 +267,3 @@ Do not install it on a normal Debian system.</p>
   [%- END %]
 [% END %]
 
-
-[% UNLESS is_virtual %]
-<div id="pmoreinfo">
-<h2>More Information on [% pkg %]</h2><p>
-Check for <a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg | uri %]">Bug Reports</a> about [% pkg %].<br>
-[% IF src %]
-  Source Package: <a href="[% src.url %]">[% src.pkg %]</a>, Download:
-  [% FOREACH src.downloads %]
-  <a href="[% server _ path %]">[[% name %]]</a>
-  [% END %]
-  [% IF src.downloads.size == 0 %]
-  Not found
-  [% END %]
-[% END %]
-
-[% IF files %]
-<br>View the <a href="[% changelogs_url _ files.changelog.path %]">Debian changelog</a><br>
-View the <a href="[% changelogs_url _ files.copyright.path %]">copyright file</a></p>
-[% END %]
-<p>
-[% IF maintainers.size == 1 -%]
-  [%- FOREACH maintainers -%]
-    <a href="mailto:[% mail %]">[% name | html %]</a> is responsible for this Debian package.
-  [%- END -%]
-[%- ELSE -%]
-  [%- FOREACH maintainers -%]
-    [%- IF loop.first -%]
-<a href="mailto:[% mail %]">[% name | html %]</a>
-    [%- ELSIF loop.last -%]
- and <a href="mailto:[% mail %]">[% name | html %]</a> are responsible for this Debian package.
-    [%- ELSE -%]
-, <a href="mailto:[% mail %]">[% name | html %]</a>
-    [%- END -%]
-  [%- END -%]
-[%- END %]
-[% IF src -%]
-See the <a href="[% pts_url _ src.pkg | uri %]">developer information for [% pkg %]</a>.
-[% ELSIF is_source %]
-See the <a href="[% pts_url _ pkg | uri %]">developer information for [% pkg %]</a>.
-[%- END %]
-[% # use url only for source packages
-   # otherwise we have too often two home page links
-   url = page.get_newest('url');
-   IF is_source && url %]
-<p>Homepage: <a href="[% url | uri %]">[% url | html %]</a></p>
-[% END %]
-[% #FIXME: should this only be used for the PTS?
-   known_vcs = [ [ 'cvs', 'CVS' ],
-               [ 'svn', 'Subversion' ],
-               [ 'bzr', 'bzr' ],
-               [ 'darcs', 'Darcs'],
-               [ 'arch', 'arch' ] ];
-   FOREACH vcs IN known_vcs;
-       vcs_id = vcs.0; vcs_name = vcs.1;
-       vcs_info = page.get_newest("vcs-$vcs_id");
-       SET vcs_info = page.get_newest("x-vcs-$vcs_id") UNLESS vcs_info;
-       IF vcs_info; %]
-<p>Repository for Debian package: <a href="[% vcs_info %]" class="pvcslink">[% vcs_info %]</a> (<acronym title="Version Control System">VCS</acronym>: [% vcs_name %])</p>
-[% END; END %]
-
-</p>
-<p>Search for <a href="[% (is_source ? src_search_url : search_url) _ pkg | uri %]">other versions of [% pkg %]</a></p>
-</div> <!-- end pmoreinfo -->
-[% END %]