From: Gerfried Fuchs Date: Fri, 20 Aug 2010 09:18:31 +0000 (+0200) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=13dc7ea813815f5583d4e31c98fd1f8d932bb46d;hp=-c;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master --- 13dc7ea813815f5583d4e31c98fd1f8d932bb46d diff --combined static/packages.css.sed.in index dc2ef7d,18a8b3b..b9af1f4 --- a/static/packages.css.sed.in +++ b/static/packages.css.sed.in @@@ -40,25 -40,21 +40,29 @@@ h1 margin-left: 1em; margin-right: 1em; } + #screenshot { + display: block; + text-align: center; + } #pmoreinfo { font-size: smaller; margin-left: 1em; float: right; - background-color: #BBDDFF; - border: thin solid #BFC3DC; + background-color: white; + color: #5B4832; + border: thin solid #5B4832; padding: 1em .5em; width: auto; + max-width: 20%; +} +#pmoreinfo h2 { + border-bottom: none; + color: #5B4832; } #pmoreinfo h3 { border-top: thin solid black; + border-bottom: none; + color: #5B4832; } #impressum { @@@ -267,8 -263,7 +271,8 @@@ table#pdeplegend, #pdownload table padding: .3em; border-top: solid gray thin; border-bottom: solid gray thin; - background-color: #bdf; + background-color: #dbba75; + color: #5B4832; } #psearchres li { margin-top: 1em; @@@ -321,9 -316,8 +325,9 @@@ padding-bottom: 4px; height: auto; text-align: left; - background: #DF0451; - color: yellow; + background-color: white; + color: #5B4832; + border-bottom: thin solid #5B4832; font-size: smaller; font-weight: bold; } @@@ -338,8 -332,9 +342,8 @@@ margin: 0; white-space: nowrap; } -#pnavbar a { - color: yellow; - text-decoration: none; +#pnavbar a, #pmoreinfo a { + color: #5B4832; } #pnavbar a:hover { } @@@ -382,7 -377,7 +386,7 @@@ .pvcslink { } -#pnavbar, .pconstantnag, #psitewidemsg { +.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 --combined templates/config.tmpl index ef9c4a6,aa1dee5..ee419ee --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -3,70 -3,70 +3,72 @@@ po_lang = 'en' ddtp_lang = 'en' - organisation = 'Debian' - project_homepage = 'http://www.debian.org/' + organisation = 'Ubuntu' + project_homepage = 'http://www.ubuntu.com/' packages_homepage = '/' + packages_homepage_abs = 'http://packages.ubuntu.com/' packages_homepage_abs = 'http://packages.debian.net/' - old_releases = 'http://archive.debian.net/' + old_releases = 'http://old-releases.ubuntu.com/' searchformurl = packages_homepage search_url = '/search' tags_url = 'http://debtags.alioth.debian.org/' bugs_url = 'http://bugs.debian.org/' + launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/' pts_url = 'http://packages.qa.debian.org/' ddpo_url = 'http://qa.debian.org/developer.php?login=' src_bugs_url = bugs_url _ 'src:' - mirror_url = 'http://ftp.debian.org/' - security_mirror = 'security.debian.org' - security_mirror_url = security_mirror _ '/debian-security' - security_suite_suffix = '/updates' - changelogs_url = 'http://packages.debian.org/changelogs/' + mirror_url = 'http://archive.ubuntu.com/' + security_mirror = 'security.ubuntu.com' + security_mirror_url = security_mirror _ '/ubuntu' + security_suite_suffix = '-security' + changelogs_url = 'http://changelogs.ubuntu.com/changelogs/' policy_url = 'http://www.debian.org/doc/debian-policy/' - cn_help_url = project_homepage _ 'intro/cn' - patch_tracking_url = 'http://patch-tracker.debian.org/package' - screenshots_url = 'http://screenshots.debian.net/package/' - screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/' +# cn_help_url = project_homepage _ 'intro/cn' +# patch_tracking_url = 'http://patch-tracker.debian.org/package' ++# screenshots_url = 'http://screenshots.debian.net/package/' ++# screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/' logo = { url => project_homepage, src => '/Pics/openlogo-nd-25.png', alt => organisation, } copyright = { - url => 'http://www.spi-inc.org/', - name => 'SPI Inc.', - years => '1997 - ' _ timestamp.year, + url => 'http://www.canonical.com/', + name => 'Canonical Ltd.', + years => timestamp.year, } license = { - url => project_homepage _ 'license' + url => project_homepage _ 'legal' } trademark = { name => copyright.name, - url => project_homepage _ 'trademark' + url => project_homepage _ 'aboutus/trademarkpolicy' } contact = { - name => g('Debian Web Mailinglist'), - mail => 'debian-www@lists.debian.org', - url => project_homepage _ 'contact', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', + url => project_homepage _ 'support', } admin = { - name => g('%s Webmaster', organisation), - mail => 'webmaster@debian.org', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', } trademarknotes = g('%s is a trademark of %s', organisation, trademark.url, trademark.name) - sponsors = [ - { - url => 'http://example.invalid/', - name => 'Example Sponsor, Inc.', - }, - { - url => 'http://example2.invalid/', - name => 'Example2 Sponsor, Inc.', - }, - ] +# sponsors = [ +# { +# url => 'http://example.invalid/', +# name => 'Example Sponsor, Inc.', +# }, +# { +# url => 'http://example2.invalid/', +# name => 'Example2 Sponsor, Inc.', +# }, +# ] -%] [%- # possible values for importance: high, normal, low - sitewidemsg = { importance => "high", - txt => g('Please note that this is an experimental version of %s. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') } +# sitewidemsg = { importance => "high", +# txt => g('Please note that this is an experimental version of %s. Errors and obsolete information should be expected', 'packages.ubuntu.com', 'packages.ubuntu.com') } -%] [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %] [%- USE num = Number.Format( decimal_point => g('.'), diff --combined templates/html/show.tmpl index 8c7fad0,c03f50e..9b31bb2 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@@ -63,9 -63,18 +63,12 @@@ [% UNLESS is_virtual %]

[% g('Links for %s', pkg) %]

+ [% IF screenshots_url && screenshots_thumb_url && !is_source %] + Screenshot + [% END %]

[% g('%s Resources:', organisation) %]