From: Frank Lichtenheld Date: Tue, 28 Nov 2006 02:21:08 +0000 (+0000) Subject: Move a remaining HTML message from DoShow.pm to show.tmpl X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=36926bc25c4342c4be4fc9babf45edc5f6862f49;p=deb%2Fpackages.git Move a remaining HTML message from DoShow.pm to show.tmpl (this commit contaminates the config.tmpl with the packages.debian.net settings, but I couldn't care less atm ;) --- diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index 87320e8..d6502ab 100644 --- a/lib/Packages/DoShow.pm +++ b/lib/Packages/DoShow.pm @@ -204,10 +204,6 @@ sub do_show { $contents{desc}{short} = _g( "virtual package" ); $contents{subsection} = 'virtual'; - my $policy_url = 'http://www.debian.org/doc/debian-policy/'; - note( sprintf( _g( 'This is a virtual package. See the Debian policy for a definition of virtual packages.' ), - $policy_url, $policy_url )); - my $provided_by = $page->{provided_by}; $contents{providers} = []; pkg_list( \%packages, $opts, $provided_by, 'en', $contents{providers} ); diff --git a/templates/config.tmpl b/templates/config.tmpl index 3eeb2ff..e89e4c9 100644 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@ -4,14 +4,15 @@ organisation = 'Debian' homepage = 'http://www.debian.org/' - packages_homepage = 'http://packages.debian.org/' + packages_homepage = 'http://packages.debian.net/' searchformurl = packages_homepage search_url = '/' tags_url = 'http://debtags.alioth.debian.org/' bugs_url = 'http://bugs.debian.org/' src_bugs_url = bugs_url _ 'src:' mirror_url = 'http://ftp.debian.org/' - changelogs_url = '/changelogs/' + changelogs_url = 'http://packages.debian.org/changelogs/' + policy_url = 'http://www.debian.org/doc/debian-policy/' cn_help_url = homepage _ 'intro/cn' logo = { url => homepage, @@ -37,8 +38,8 @@ } trademarknotes = organisation _ ' is a trademark of ' _ copyright.name -%] -[%#- +[%- # possible values for importance: high, normal, low - sitewidemsg = { importance => "low", + sitewidemsg = { importance => "high", txt => "Please note that this is an experimental version of packages.debian.org. Errors and obsolete information should be expected" } -%] diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl index fba7dfe..43e9b60 100644 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@ -130,14 +130,16 @@ Do not install it on a normal Debian system.

[% END %] -[% UNLESS is_virtual %]
-[% IF desc.short %] +[% UNLESS is_virtual %] + [% IF desc.short %]

[% desc.short %]

[% desc.long %] + [% END %] +[% ELSE %] +

This is a virtual package. See the Debian policy for a definition of virtual packages.

[% END %]
-[% END %] [% FOREACH tag IN tags %] [% IF loop.first -%]