From d91be7084282f1c9e1df96ce160c5621145f4fc2 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 28 Nov 2006 00:40:55 +0000 Subject: [PATCH] Try another layout for the "moreinfo" part --- static/packages.css.sed.in | 53 +++++++++++---- templates/html/show.tmpl | 132 +++++++++++++++++++------------------ 2 files changed, 108 insertions(+), 77 deletions(-) diff --git a/static/packages.css.sed.in b/static/packages.css.sed.in index 082abba..9cfd0c3 100644 --- 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 1a7ca12..fba7dfe 100644 --- 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' %] +[% UNLESS is_virtual %] +
+

Links for [% pkg %]

+

Debian Resources:

+ + +[% #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; %] +

Debian Package Repository (VCS: [% vcs_name %]):
[% vcs_info %]

+[% END; END %] + +[% IF src %] +

Download Source Package [% src.pkg %]: + [% FOREACH src.downloads %] + [% '

' IF loop.last %] + [% END %] + [% IF src.downloads.size == 0 %] + Not found + [% END %] +[% END %] + +[% IF maintainers.size == 1 -%] +

Maintainer:

+ [%- FOREACH maintainers -%] + [% name | html %] + [%- END -%] +[%- ELSE -%] +

Maintainers:

+ [%- FOREACH maintainers -%] + [%- '' IF loop.last -%] + [%- END -%] +[%- END %] + +[% url = page.get_newest('url'); + IF url %] +

External Resources:

+

Homepage: [% url | html %]

+[% END %] + +
+[% END %] + [% IF suite == "experimental" || subsection == "debian-installer" %]
[% IF suite == "experimental" %] @@ -199,67 +267,3 @@ Do not install it on a normal Debian system.

[%- END %] [% END %] - -[% UNLESS is_virtual %] -
-

More Information on [% pkg %]

-Check for Bug Reports about [% pkg %].
-[% IF src %] - Source Package: [% src.pkg %], Download: - [% FOREACH src.downloads %] - [[% name %]] - [% END %] - [% IF src.downloads.size == 0 %] - Not found - [% END %] -[% END %] - -[% IF files %] -
View the Debian changelog
-View the copyright file

-[% END %] -

-[% IF maintainers.size == 1 -%] - [%- FOREACH maintainers -%] - [% name | html %] is responsible for this Debian package. - [%- END -%] -[%- ELSE -%] - [%- FOREACH maintainers -%] - [%- IF loop.first -%] -[% name | html %] - [%- ELSIF loop.last -%] - and [% name | html %] are responsible for this Debian package. - [%- ELSE -%] -, [% name | html %] - [%- END -%] - [%- END -%] -[%- END %] -[% IF src -%] -See the developer information for [% pkg %]. -[% ELSIF is_source %] -See the developer information for [% pkg %]. -[%- 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 %] -

Homepage: [% url | html %]

-[% 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; %] -

Repository for Debian package: [% vcs_info %] (VCS: [% vcs_name %])

-[% END; END %] - -

-

Search for other versions of [% pkg %]

-
-[% END %] -- 2.39.2