From: Gerfried Fuchs Date: Sat, 5 Feb 2011 15:05:57 +0000 (+0100) Subject: Merge branch 'debian-master' into debian-master-kalle X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=8a8494d6306fcf536dfdecbd0cab0e3e83c4112c;hp=a168232b746fed06714bbb2100be8cf15f032b30;p=deb%2Fpackages.git Merge branch 'debian-master' into debian-master-kalle --- diff --git a/config.sh.sed.in b/config.sh.sed.in index 07adaf4..479cbcc 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -45,7 +45,7 @@ ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk archives="us security debports backports volatile" sections="main contrib non-free" parts="$sections" -suites="lenny lenny-volatile lenny-backports squeeze squeeze-backports sid experimental" +suites="lenny lenny-volatile lenny-backports lenny-backports-sloppy squeeze squeeze-backports sid experimental" priorities="required important standard optional extra" dists="$suites" architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc powerpcspe s390 sh4 sparc sparc64" diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports index 9acc155..72b56b9 100755 --- a/cron.d/100syncarchive_backports +++ b/cron.d/100syncarchive_backports @@ -7,35 +7,35 @@ cd ${archivedir} # backports archive # -for dist in etch lenny squeeze +for dist in lenny-backports lenny-backports-sloppy squeeze-backports do - echo "retrieve Release(.gpg) $dist-backports" - test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports - (cd backports/${dist}-backports && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Release && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Release.gpg ) + echo "retrieve Release(.gpg) $dist" + test -d backports/${dist} || mkdir -p backports/${dist} + (cd backports/${dist} && + $wget_cmd -N ${backports_ftpsite}/dists/${dist}/Release && + $wget_cmd -N ${backports_ftpsite}/dists/${dist}/Release.gpg ) foo=\$arch_${dist//-/_} for arch in `eval echo $foo` do for part in ${parts} do - echo retrieve Packages $dist-backports/$part/$arch - test -d backports/${dist}-backports/${part}/binary-${arch} || mkdir -p backports/${dist}-backports/${part}/binary-${arch} - (cd backports/${dist}-backports/${part}/binary-${arch} && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/${part}/binary-${arch}/Packages.gz) + echo retrieve Packages $dist/$part/$arch + test -d backports/${dist}/${part}/binary-${arch} || mkdir -p backports/${dist}/${part}/binary-${arch} + (cd backports/${dist}/${part}/binary-${arch} && + $wget_cmd -N ${backports_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) done - echo retrieve Contents $dist-backports/$arch - (cd backports/${dist}-backports && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Contents-${arch}.gz) + echo retrieve Contents $dist/$arch + (cd backports/${dist} && + $wget_cmd -N ${backports_ftpsite}/dists/${dist}/Contents-${arch}.gz) done for part in ${parts} do - echo retrieve Sources $dist-backports/$part - test -d backports/${dist}-backports/${part}/source || mkdir -p backports/${dist}-backports/${part}/source - (cd backports/${dist}-backports/${part}/source && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/${part}/source/Sources.gz) + echo retrieve Sources $dist/$part + test -d backports/${dist}/${part}/source || mkdir -p backports/${dist}/${part}/source + (cd backports/${dist}/${part}/source && + $wget_cmd -N ${backports_ftpsite}/dists/${dist}/${part}/source/Sources.gz) done - $check_release_cmd $archivedir/backports/${dist}-backports/Release + $check_release_cmd $archivedir/backports/${dist}/Release done diff --git a/po/templates.bg.po b/po/templates.bg.po index 82bea69..fb49ad9 100644 --- a/po/templates.bg.po +++ b/po/templates.bg.po @@ -1,27 +1,27 @@ # Bulgarian translation of templates.pot # This file is put in the public domain. -# Damyan Ivanov , 2010. +# Damyan Ivanov , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: packages.debian.org\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-10-14 00:02+0200\n" -"PO-Revision-Date: 2010-07-13 08:20+0300\n" +"PO-Revision-Date: 2011-01-28 16:41+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: binary\n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: templates/config.tmpl:44 msgid "Debian Web Mailinglist" -msgstr "" +msgstr "Пощенския списък debian-www" #: templates/config.tmpl:49 msgid "%s Webmaster" -msgstr "" +msgstr "Отговорниците за уебсайта" #: templates/config.tmpl:52 msgid "%s is a trademark of %s" @@ -182,7 +182,7 @@ msgstr "Дистрибуция:" #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5 #: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14 msgid "Overview over this suite" -msgstr "" +msgstr "Преглед на дистрибуцията" #: templates/html/download.tmpl:6 templates/html/filelist.tmpl:6 #: templates/html/show.tmpl:17 @@ -356,12 +356,16 @@ msgid "" "To report a problem with the web site, e-mail %s. " "For other contact information, see the %s contact page." msgstr "" +"При проблеми със сайта, пишете на %s. За други " +"контакти вижте страницата %s контакти." #: templates/html/foot.tmpl:32 msgid "" "Content Copyright © %s %s; See license terms." msgstr "" +"Авторски права върху съдържанието © %s; лицензни условия." #: templates/html/foot.tmpl:35 msgid "Learn more about this site" @@ -481,7 +485,7 @@ msgstr "Показване само на точните съвпадения:" #: templates/html/homepage.tmpl:63 templates/html/homepage.tmpl:70 #: templates/html/homepage.tmpl:116 msgid "any" -msgstr "" +msgstr "без значение" #: templates/html/homepage.tmpl:65 templates/html/show.tmpl:16 msgid "Section:" @@ -762,11 +766,11 @@ msgstr "Двоични пакети:" #: templates/html/search.tmpl:149 msgid "show %u binary packages" -msgstr "Показване на двоичните пакети на %u" +msgstr "Показване на %u двоичните пакета" #: templates/html/search.tmpl:149 msgid "hide %u binary packages" -msgstr "Скриване на двоичните пакети на %u" +msgstr "Скриване на %u двоични пакета" #: templates/html/search.tmpl:159 msgid "" @@ -928,7 +932,7 @@ msgstr "Изтегляне на пакет-източник %sdefinition of virtual " "packages." msgstr "" +"Това е виртуален пакет. Вижте Политиката на Дебиан за дефиницията на виртуален " +"пакет." #: templates/html/show.tmpl:202 msgid "Tags" @@ -1055,6 +1062,9 @@ msgid "" "In addition it gives information about the package size and the installed " "size." msgstr "" +"Таблицата съдържа връзки за изтегляне на пакетите и списъци на съдържаните " +"файлове. Добавена е и информация за размера на пакета и заеманото дисково " +"пространство след инсталиране." #: templates/html/show.tmpl:298 msgid "Download for all available architectures" @@ -1109,10 +1119,12 @@ msgid "" "Debian Package Source Repository (VCS: %s)" msgstr "" +"Хранилище на изходния код на пакета (СКП: %s)" #: templates/html/show.tmpl:371 msgid "Debian Package Source Repository (Browsable)" -msgstr "" +msgstr "Хранилище на изходния код на пакета (за разглеждане през браузър)" #: templates/html/suite_index.tmpl:3 msgid "Index" @@ -1136,15 +1148,15 @@ msgstr "Преглед на наличните етикети" #: templates/html/tag_index.tmpl:4 msgid "About" -msgstr "" +msgstr "За сайта" #: templates/html/tag_index.tmpl:5 msgid "Debtags" -msgstr "" +msgstr "Етикети" #: templates/html/tag_index.tmpl:10 msgid "Facet: %s" -msgstr "" +msgstr "Аспект: %s" #: templates/rss/newpkg.tmpl:16 msgid "New %s Packages" @@ -1168,7 +1180,7 @@ msgstr "" #: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4 msgid "Copyright ©" -msgstr "" +msgstr "Авторски права ©" #: templates/txt/index_head.tmpl:1 msgid "All %s Packages in \"%s\"" @@ -1176,7 +1188,7 @@ msgstr "Всички пакети %s в „%s“" #: templates/txt/index_head.tmpl:3 msgid "Generated:" -msgstr "" +msgstr "Генерирано на" #: templates/txt/index_head.tmpl:5 msgid "See for the license terms." diff --git a/static/Pics/admon-important.png b/static/Pics/admon-important.png new file mode 100644 index 0000000..c5726d5 Binary files /dev/null and b/static/Pics/admon-important.png differ diff --git a/static/Pics/admon-note.png b/static/Pics/admon-note.png new file mode 100644 index 0000000..d01b8c6 Binary files /dev/null and b/static/Pics/admon-note.png differ diff --git a/static/Pics/admon-tip.png b/static/Pics/admon-tip.png new file mode 100644 index 0000000..2ac5747 Binary files /dev/null and b/static/Pics/admon-tip.png differ diff --git a/static/Pics/admon-warning.png b/static/Pics/admon-warning.png new file mode 100644 index 0000000..f5c7a6f Binary files /dev/null and b/static/Pics/admon-warning.png differ diff --git a/static/Pics/dep.png b/static/Pics/dep.png new file mode 100644 index 0000000..cc2a137 Binary files /dev/null and b/static/Pics/dep.png differ diff --git a/static/Pics/gradient.png b/static/Pics/gradient.png new file mode 100644 index 0000000..33009da Binary files /dev/null and b/static/Pics/gradient.png differ diff --git a/static/Pics/greydot.png b/static/Pics/greydot.png new file mode 100644 index 0000000..ec23c01 Binary files /dev/null and b/static/Pics/greydot.png differ diff --git a/static/Pics/openlogo-50.png b/static/Pics/openlogo-50.png new file mode 100644 index 0000000..350e156 Binary files /dev/null and b/static/Pics/openlogo-50.png differ diff --git a/static/Pics/openlogo-nd-25.png b/static/Pics/openlogo-nd-25.png index 5ad4487..8732e70 100644 Binary files a/static/Pics/openlogo-nd-25.png and b/static/Pics/openlogo-nd-25.png differ diff --git a/static/Pics/rec.png b/static/Pics/rec.png new file mode 100644 index 0000000..2376fc5 Binary files /dev/null and b/static/Pics/rec.png differ diff --git a/static/Pics/reddot.png b/static/Pics/reddot.png new file mode 100644 index 0000000..76cc993 Binary files /dev/null and b/static/Pics/reddot.png differ diff --git a/static/Pics/sug.png b/static/Pics/sug.png new file mode 100644 index 0000000..d7ba341 Binary files /dev/null and b/static/Pics/sug.png differ diff --git a/static/debian.css b/static/debian.css index fce9493..fcef8be 100644 --- a/static/debian.css +++ b/static/debian.css @@ -1,638 +1,832 @@ -/* css file for debian web site - Jutta Wrage 2004 */ +/* + http://www.debian.org Stylesheet -/* all pages have a header, outer inner and footer -leftcol and maincol can be omitted, there will be other boxes -to replace later (eg. two content columns) -normal page: - -
-
-
- Leftcol is for menus - if omitted, maincol can be omitted, too -
-
- Maincol with margin left is for the content - But content may go directly to inner -
-
- -
-color logo #C60036 -cd-pages: bgcolor="#e09e86" - navbar -*/ + Copyright 2011 Kalle Söderman -/* { border: 1px solid yellow; } */ -html, body { - color: #000000; - background-color: #FFFFFF; - margin: 0 4px 0 4px; - padding: 0; - text-align: left; - font-family: Arial, Helvetica, sans-serif; - /* min-width: 440px - commented out due to mozilla problems*/ -} -/* direction directive reverses the navbar, too */ -/* html[lang|=ar] { - direction: rtl !important; - text-align: right !important; -} */ + This stylesheet is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as published by + the Free Software Foundation. -img { border: 0; } + This program is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License for more details. -h1 { text-align: center; } + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + Street, Fifth Floor, Boston, MA 02110-1301 USA. -acronym { - border-bottom: 1px dotted #000000; -} + The license text can also be found at http://www.gnu.org/copyleft/gpl.html and + /usr/share/common-licenses/GPL-2 on Debian GNU/Linux. +*/ + +/* + Font size table (Browser default 16px) + + pixels relative + -------------------- + 36px 2.25em + 31px 0.5161em + 24px 1.5em + 21px 1.3125em + 18px 1.125em + 16px 1em + 14px 0.875em + 12px 0.75em + 11px 0.6875em + 10px 0.625em + 9px 0.5625em + -------------------- +*/ -hr.hidecss { +/* Reset */ + +html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, +blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, +font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, +dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, +tfoot, thead, tr, th, td { + margin: 0; + padding: 0; border: 0; + outline: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + font-family: inherit; + vertical-align: baseline; +} + +body { line-height: 1; color: black; background: white; } +ol, ul { list-style: none; } +table { border-collapse: separate; border-spacing: 0; } +blockquote, q { quotes: "" ""; } +html { background-color: transparent; } +:focus { outline: 0; } +caption, th, td { text-align: left; font-weight: normal; } +blockquote:before, blockquote:after, q:before, q:after { content: ""; } + +/* Main */ + +body { + margin: 0; + font: normal 100% sans-serif; + line-height: 1.5; + color: #222; + background-color: white; + background-image:url('Pics/gradient.png'); + background-position: 0 0; + background-repeat: repeat-x; + /* Uncomment to show baseline grid + background-image: url('24grid.png'); + background-position: 30px 9px; + */ +} +#content { + margin: 0 10px 0 52px; } - -hr { - border-bottom: 0; - border-top: 1px solid #BFC3DC; +#inner { + position: relative; +} +#maincol { + margin: 0 15em 1.5em 0; } -samp { - display: block; - margin-left: 2em; +/* Header */ + +#header { + margin:0; + padding:0 10px 0 52px; } -div.sampleblock { - width: 80%; - margin: auto; - font-family:courier, serif; - font-size: 90%; +#header a:link +, #header a:visited +, #second-nav a:link +, #second-nav a:visited { + text-decoration: none; } -div.quoteblock { - width: 75%; - margin: auto; - font-size: 90%; - text-align: justify; +#header a:hover +, #second-nav a:hover { + text-decoration: underline; +} +#breadcrumbs { + margin:0; + font-size: 0.75em; + text-transform: lowercase; + line-height: 2; + background-color: transparent; + background-color: #f5f6f7; + border-bottom: 1px solid #d2d3d7 ; + min-height: 20px; +} +#breadcrumbs:before { + content: "/"; + margin-left: 0.5em; + margin-right: 0.5em; } - -.quoteblock div.preimg { +p.section { + margin: 0; + padding: 0 5px 0 5px; + font-family:monospace; + line-height: 16px; + color:white; + text-transform: uppercase; + letter-spacing: 0.08em; + position:absolute; + top: 0px; + left:52px; + background-color: #c70036; +} +p.section a { + color: white; + text-decoration: none; +} +p.section a:hover { + color:white; + text-decoration: underline; +} +#navbar { + background-color: transparent; + list-style:none; + display:block; + border-bottom:1px solid #c70036; + text-indent:0; + padding: 0; + margin-top:0; + margin-bottom:0; +} +#navbar ul { + margin: 0; + padding: 0; + clear: both; + overflow: hidden; + min-height: 45px; +} +#navbar li { + list-style: none; float: left; - margin-top: 0.2em; + padding: 0; + margin: 0; } -.quoteblock cite { +#navbar a:link +, #navbar a:visited { + padding: 1.75em 0.5em 0.25em 0.5em; + border-left: 1px solid transparent; + border-right: 1px solid transparent; display: block; - text-align: right; + text-decoration: none; } -blockquote.question { - font-style: italic; +#navbar a:visited { + color: #54638c; } -blockquote.question p span { - font-style: normal; - width: 10%; +#navbar a:hover +, #navbar a:visited:hover { + background-color: #f5f6f7; + border-left: 1px solid #d2d3d7; + border-right: 1px solid #d2d3d7; + text-decoration: underline; } -#pagewidth { - width: 100%; - text-align: left; +ul.subnav { + list-style: none; + margin-left: 0; + padding-left: 0; + margin-top: 0; } - -/* now the header*/ -#header { - margin-left: -3px; - width: 100%; - height: auto; +ul.subnav li { + display: inline; + margin-right: 1em; +} +#searchbox { + text-align:left; + line-height: 1; + margin: 0 10px 0 0.5em; + padding: 1px 0 1px 0; + position: absolute; + top:0; + right:0; + font-size: 0.75em; +} +#searchbox p { + margin: 0; + padding: 0; } - -/* upper nested header box*/ #upperheader { - width: 100%; - margin-top: 11px; - height: auto; - /* height: 4.8em; */ - background: #FFFFFF; + margin:0; + padding:0; } - #logo { - float: left; - margin-left: 6px; - background: #FFFFFF; -} - -#serverselect { - float: right; + position:absolute; + top:0; + left:0; + padding: 0; + background-color: transparent; + border: 1px solid transparent; + border-top: 0; + width: 50px; + height: 5.07em; + min-height: 65px; +} +#logo a { display: block; - padding-top: 1px; - margin-right: 6px; - margin-left: auto; - text-align: right; - top: 0; - right: 0; -} - -#serverselect:lang(de) { - width: 15em; + position: relative; + padding: 0; + height: 100%; + min-height: 65px; } -#serverselect:lang(en) { - width: 13em; +#logo img { + margin-top: 5px; + position: absolute; + bottom: 0.3em; + overflow: auto; } - -#serverselect p { - color: #990000; - font-size: 0.8em; - font-weight: normal; +#logo:hover { + border: 1px solid #d2d3d7 ; + border-top: 0; + background-color: #f5f6f7; } -#serverselect p select { - font-size: 88%; -} +/* Links */ -#serverselect p input { - font-size: 88%; +a:link { + color: #0035c7; + text-decoration: underline; } -.centerlogo { - margin-left: 260px; - margin-right: auto; - width: 125px; - text-align: center; - vertical-align: bottom; +a:visited { + color: #54638c; } -#cdlogo { +a:link:hover { + text-decoration: none; + color: #00207a; } - -#navbar { - /* margin-top: 1em; */ - clear: both; - padding-left: 0px; - /* margin-top: 5px; */ - padding-top: 6px; - padding-bottom: 4px; - width: 100%; - height: auto; - text-align: center; - background: #DF0451; +a:visited:hover { + text-decoration: none; } -#navbar ul { - display: inline; - list-style-type: none; - padding-left: 0px; - line-height: 1.5em; +a:active { + color:#c2c3c7; } -#navbar ul li { - display: inline; - margin: 0; - white-space: nowrap; +a img { + border:0; } -#navbar a { - color: #FFFFFF; - text-decoration: none; - padding: 0.2em 0.4em 0.2em 0.4em; - background-color: #000084; - border: 1px solid #000084; - font-family: Arial, Helvetica, sans-serif; +a.rss_logo { + font-size: 0.75em; + float: right; + width: 35px; + line-height: 10px; + color: #ffffff; + background-color: #ff6600; font-weight: bold; - font-size: 0.9em; -} -#navbar a:hover { - background: #0000CC; -} -#navbar .hidecss, .hidecss { - display: none; + font-family: sans-serif; + text-align: center; + text-decoration: none; + padding: 0.25em; + margin-left: 0.25em; + border: 1px solid #ff6600; } -/* the rest of page out of two nested boxes around */ +a.rss_logo:hover { + background-color: white; + border: 1px solid #ff6600; + color: #ff6600; +} -#outer { - background-color: #FFFFFF; - width: auto; - /* border:solid white 2px; */ +a.rss_logo.generic { + background-color: #ff8800; } -#inner { - margin: -2px; - margin-top: 0; - width: 100%; - background: #FFFFFF; - /* overflow: auto; */ +a.rss_logo.generic:hover { + background-color: #ee7700; } -#leftcol { - float: left; - margin: 0em 0.4em 0 0; - padding-left: 0; - padding-bottom: 1em; - width: auto; - background: #BBDDFF; - font-size: 0.9em; - font-family: Arial, Helvetica, sans-serif; - border: 1px solid #BBDDFF; - /* overflow: auto; */ + +/* Secondnav */ + +#second-nav { + width: 16em; + font-size: 0.75em; + line-height: 1.5; + float: right; + top: 0; + right: 0; + margin: 3em 0 0 0; + padding: 0 0 0 1em; + border-left: 1px solid #d2d3d7 ; } -#leftcol a:link, #leftcol a:visited { - display: block; +#second-nav ul { + padding:0; + margin:0; + list-style:none; } -#leftcol a:hover { - background-color: #DDEEFF; - /* background-color: #FFFFFF; */ +#second-nav ul ul { + margin-left: 1em; } -#leftcol ul { - margin: 2px; - padding: 0; - list-style-type: none; +#second-nav li { + font-weight: normal; + margin:0; + padding:0; +} +#second-nav p { + line-height: 2; font-weight: bold; + margin: 0; } -#leftcol ul.votemenu { - width: 11em; +#second-nav h2 { + margin:0; } -#leftcol ul.cdmenu { - width: 12em; + +/* Typography */ + +p { + margin: 1.5em 0 1.5em 0; } -#leftcol ul.votemenu ul li, #leftcol ul.cdmenu ul li { - padding-bottom: 0.4em; +strong { + font-weight: bold; } -#leftcol li ul { - display: inline; +em { + font-style: italic; + color: #444; } -#leftcol ul li { - padding: 0.2em 0; +small { + font-size: 0.75em; } -#leftcol ul ul { - font-size: 0.9em; - margin: 0; +sup { + font-size: 0.75em; + vertical-align:top; } -#leftcol ul li a { - line-height: 1.2em; - padding-right: 0.5em; - /* padding: 0.2em 0 0.3em 0em; */ +h1 +, h2 +, h3 +, h4 +, h5 +, h6 { + font-weight: 600; + color: black; } -#leftcol ul ul li a { +h1 { font-weight: normal; - padding: 0.1em 0.5em; - line-height: 1.1em; + font-size: 1.8em; + line-height: 0.83333; + margin: 0.83333em 0 0.83333em 0; } -#leftcol ul ul li { - padding-top: 0; +h2 { + font-size: 1.4em; + font-weight: normal; + line-height: 1.0714286; + margin: 1.0714286em 0 1.0714286em 0; } -#leftcol p { - margin-left: 2px; - margin-right: 2px; +h3 { + font-size: 1.125em; + line-height: 1.333em; + margin: 1.333em 0 0 0; } -#leftcol p a { - display: block; - margin: 0; +h4 { + font-weight: normal; + font-style: italic; + margin: 1.5em 0 1.5em 0; + color: #444; } -#leftcol p img { - margin-left: 1em; +h5 { + font-style: italic; + font-size: 0.75em; + margin: 2em 0 2em 0; } - -#maincol { - background: #FFFFFF; - margin-left: 12em; - margin-right: 0.5em; - margin-bottom: 1em; +ol,ul { + padding-left: 1.5em; + margin-left:0; + margin: 1.5em 0 1.5em 0; } - -#maincol:lang(en), #maincol:lang(cz), #maincol:lang(ko), - #maincol:lang(no), #maincol:lang(sk), #maincol:lang(tr), - #maincol:lang(zh-CN), #maincol:lang(zh-HK), #maincol:lang(zh-TW) { - margin-left: 10em; +ol>ol, ul>ul, li>ol, li>ul { + margin: 0; } -#lefthalfcol { - float: left; - margin-left: 0em; - width: 49%; +ol { + list-style-type: decimal; } - -#lefthalfcol dl { - margin-top: 0em; +ul { + list-style-type: disc; } - -#righthalfcol { - margin-left: 50%; - width: 50%; +th { + font-weight: bold; + margin: 1.5em 0 1.5em 0; } - -#righthalfcol dl { - margin-right: 0.2em; +hr { + border: none; + background-color: #bbb; + height: 1px; + margin: 1.4375em 0 1.5em 0; } - -#footer { - clear: both; - width: 100%; - padding-top: 3px; - bottom: 0; - text-align: center; - margin: 1em 0 0 0; - border-top: 1px solid #BFC3DC; +pre { + margin: 1.5em 0 1.5em 0; + overflow: auto; + font-family: monospace; + white-space: pre; + color: black; } - -#fineprint { - margin-top: 0.2em; - padding-top: 3px; - text-align: center; - font-size: 0.85em; +tt, code { + font-family: monospace; + white-space: pre; + color: black; } - -.bordertop { border-top: 1px solid #BFC3DC; } - -dl.gloss dt { +dt { + margin: 1.5em 0 0 0; font-weight: bold; } - -#footer ul { - display: inline; - list-style-type: none; +dd { + margin: 0 0 0 1.5em; } - -#footer ul li { - display: inline; +blockquote { + font-size: 0.75em; + margin: 2em; + line-height: 2; } - -#footer ul li a, table.y2k td { - white-space: nowrap; +cite { + font-style: italic; + color: #444; } - -#footer p { - margin: 0px; +acronym, abbr { + text-transform: uppercase; + font-size: 0.9em; } - -#main { - background: #bbddff; - padding: 1em 0; /* have some padding to get rid of collapsed margins */ +.toc { + font-size: 0.75em; + list-style:none; + background-image: url('Pics/greydot.png'); + background-position: bottom left; + background-repeat: repeat-x; + line-height:1.833; + padding: 0; + max-width: 62%; + margin: 2em 0 2em 0; +} +.toc li { + background-image: url('Pics/greydot.png'); + background-position: top left; + background-repeat: repeat-x; + padding: 0.0833em 0 0.0833em 0; + } +.toc a { + display:block; + text-decoration: none; +} +.toc a:hover { + display:block; + background-color: #f0f0f4; + text-decoration: underline; +} +.toc dt { + margin: 0; + background-image: url('Pics/greydot.png'); + background-position: top left; + background-repeat: repeat-x; + padding: 0.0833em 0 0.0833em 0; } -/* classes for cards */ +/* Sitemap */ -.cardleft { - margin: 0 0 1em; - float: left; - width: 49%; +.card { + clear:both; + margin:1.5em 0 1.5em 0; + background-position: 0 -50px; + background-repeat: repeat-x; + padding:0; } -.cardright { - margin-left: 50% - /*margin: 0 1% 2em 50%; */ +.card ul { } -.card { - clear: left; - margin: 0 0 1em; +.card ul li { + list-style:none; +} +.card h2 { +} +.lefthalf { + float:left; } +.righthalf { + margin-left:50%; +} +.lefthalf ul { + margin-top:0; +} + +/* Footer */ -.cardleft h2, .cardright h2, .card h2 { - font-size: 120%; - background: #000000; - color: #FFD400; +#footer { + font-size: 0.75em; + border: 1px solid #dfdfe0; + padding:1em; + background-color: #f5f6f7; + margin: 0 10px 0 52px; + line-height: 1.5em; + border-left: 0; + border-right: 0; +} +#content #footer { + margin-left: 0; +} +#footer p { + margin: 1em 0 1em 0; +} +#footer hr { + border-top: 1px solid #d2d3d7; + border-bottom: 1px solid white; + height: 0; +} +#footer .editbar li { display: inline; - padding: 0.2em 0.4em; - margin: 0 10px; - font-family: Arial, Helvetica, sans-serif; - letter-spacing: 0.2em; + margin-right: 2em; } - -.cardleft dl dd, .cardright dl dd , .card dl dd { - padding-bottom: 0.5em; +#footer .info { } - -.cardleft div, .cardright div, .card div { - border: 2px solid #000000; - background: #FFFFFF; - padding: 0.5em; - margin: 2px 10px; - /* the next two lines xpand the div to heigth of left inner div */ - overflow: auto; +#fineprint { + margin-bottom: 1em; } - -div.lefthalf { - float: left; - width: 49%; - border: 0; - margin: 0; +#footermap { + list-style:none; + margin: 0 0 0 0; padding: 0; -} - -div.righthalf { + width:100%; + overflow: hidden; border: 0; +} +ul#footermap-cola a +, ul#footermap-colb a +, ul#footermap-colc a +, ul#footermap-cold a +, ul#footermap-cole a { + padding-left: 0; +} +ul#footermap-cola +, ul#footermap-colb +, ul#footermap-colc +, ul#footermap-cold +, ul#footermap-cole { + float:left; + width: 19%; + min-width: 11em; + height: 12em; /* Update when adding items */ + margin:0 1% 0 0; + padding: 2em 0 0 0; + list-style: none; +} +ul#footermap-cole { + width: 18.9%; + margin-right:0; +} +#footermap-wrap { + padding:2em; + border-top: 1px solid white; +} +#footermap a { + margin: 0; +} +#footermap ul{ + list-style: none; + padding:0; +} +#footermap li { + text-indent:0; + background-color: transparent; + font-weight:bold; +} +#footermap li ul { margin: 0; padding: 0; } -/* colors for packages, warnings and news in ports */ -.warning, dt.new, .no { - color: red; /* FF0000 */ +#footermap li li { + margin:0; + text-indent:0; + padding:0; + font-weight:normal; + border:0; + background-image:none; + background-color:transparent; } - -.psmallcenter, .psmalltrademark { - clear: both; - font-size: 0.85em; - text-align: center; +#serverselect { } - -.psmalltrademark { - color: green; -} -table.ridgetable, table.reltable { - border-width: 4px; - border-color: gray; - margin: 0 1em 1em 1em; - border-style: ridge; - border-collapse: collapse; -} -table.vote { - margin: 0 auto; - border-width: 3px; - border-color: gray; - border-style: ridge; - border-collapse: collapse; -} -#pcontentsres col, #pcontentsres th, #pdownload th, #pdownload td, table.ridgetable th, table.ridgetable td, - table.reltable td, table.reltable th { - border: 2px #BFC3DC; - border-style: ridge; - padding: 0.1em; -} -table.reltable th { - background-color: #44CCCC; -} -table.vote th { - border: 1px solid gray; - background-color: #DDDDDD; -} -table.vote td { - border: 1px solid gray; - padding: 4px; -} -table.reltable tr.odd { - background-color: #FFFFFF; -} -table.reltable tr.even { - background-color: #DDDDDD; -} -table.stattrans { - margin: 0 auto; - width: 95%; - border: 1px solid black; - background-color: #cdc9c9; -} -table.stattrans th { - text-align: center; - padding: 2px; +#serverselect input +, #serverselect option +, #serverselect select { } -table.stattrans td { - text-align: right; - padding: 2px; +#serverselect ul { + display: inline; + margin-left: 2em; } -table.stattrans tbody th { - text-align: left; - font-weight: normal; +#serverselect li { + list-style: none; + display: inline; + padding:0 1em 0 1em; + margin:0; +} +#serverselect form p { + margin:0; + padding:0; + line-height: 1; +} +.lcol50 { + float: left; + width: 49%; + font-size:0.75em; + margin:0 0 0 0; + padding:0 0.5em 0 0; +} +.lcol50 h2 { + margin-top:0; +} +.rcol50 { + margin:0 0 0 51%; + padding:0; + font-size:0.75em; +} +form#pageLang { + display: inline; } -/* partners */ -.partnertype { - background-color: #DD0000; - padding: 0.2em 0 0.2em 1em; - color: #FFFFFF; +/* Extras */ +input:focus { + background-color:#FFFFCB; + } -div.partnerlogo { - display: table-cell; - vertical-align: middle; - text-align: center; - width: 30%; +.hidecss { + display: none; } -div.partnerdesc { - display: table-cell; - font-size: 85%; +.clear { + clear:both } -div.cdflash { - background-color: #E09E86; - width: 80%; - margin: auto; - text-align: center; +#clear { + clear:both; + border:0; + height:1px; + display:block; } -.cdrsync { - color: #6B1300; +.quicklist:before { + content: "Quick Links: "; + font-weight: bold; } -/* debian installer */ - -.dierror { - background-color: #FF6060; +.quicklist { + list-style: none; + font-size: 0.75em; + margin: 2em 0 2em 0; + padding:0; + text-indent:0; + line-height: 2em; } -.dibad { - background-color: #F7FF60; +.quicklist li { + display:inline; } -.digood { - background-color: #7AFF71; +.item p{ + margin: 0; } - -/* useful classes */ - -th.eventheader { - background-color: #BBDDFF; +.item h2 +, .item p +, .item ul{ + margin-right: 10px } -.center { - text-align: center; +.item h2 +, .item h3 +, .item h4 +, .item h5 { + margin-top: 0; +} +.line { + padding: 0; + width: auto; + overflow: hidden; + } +div.downloads { + border-top: 0.17em solid #339900; + margin: 1.33em 0 0 0; +} +.downloads ul.downlist { + margin:0; +} +div.downloads .col50 { + border-top: 0.15em solid #339900; +} +ul.downlist { + padding-left: 30px; + text-indent:0; + background: url('Pics/emblem-downloads.png') no-repeat 0 0.15em; + /* + * border-top: 0.17em solid #339900; + */ +} +ul.quicklist.downlist { + border-top: 0.17em solid #339900; + padding-top: 0.25em; + margin-top: 1.6em; +} +ul.downlist li { + display: inline; +} +ul.downlist li:after { + content: ', '; +} +ul.downlist li:last-child:after { + content: ''; +} +div.tip +, div.important +, div.warning +, div.note +, p.trans-note { + padding:0 2em 0 4em; + margin: 1.85em 0 1.85em 0; + background-repeat: no-repeat; + background-position: 0.5em 1em; + font-size: 0.75em; + line-height: 2em; + background-color:#FFFFCB; + border:0.15em solid #CCCCA3; } -.right { - text-align: right; +div.tip p +, div.important p +, div.warning p +, div.note p { + margin: 1em 0 1em 0; } -ul.circlelist { - list-style-type: circle; +div.tip +, p.trans-note { + background-image: url('Pics/admon-tip.png'); } -.centerdiv table { - margin-left: auto; - margin-right: auto; +div.important{ + background-image: url('Pics/admon-important.png'); } -ul.discless { - list-style-type: none; +div.warning { + background-image: url('Pics/admon-warning.png'); } -.top, img.ico { - vertical-align: top; +div.note { + background-image: url('Pics/admon-note.png'); } -img.ico { + +/* Layout Elements */ + +.col50 +, .cardleft +, .cardright { + width:47.5%; float: left; - margin: 0 0.2em 0 0; + padding-bottom: 1.5em; } -img.rightico { - float: right; - vertical-align: top; - margin: 0 0 0 0.2em; +.lastcol +, .cardright { + margin: auto; + width: 47.5%; + float:left; + padding-right: 0; + margin-left: 5%; } -img.cve { - vertical-align: -25px; +.lastcol h2 +, .lastcol p +, .lastcol ul { + margin-right:0; } -.y2kok, .yes { - color: #00BB00; +.cardleft h2 { + margin-right: 1em; } -.y2kok2 { - color: #00BBBB; +.cardright div { + margin-left: 1.5em; } -.bluehead { - color: #0000FF !important; +.cardright h2 { + margin-left: 1em; } -span.halfsize { - font-size: 80%; +.votemenu a { + display:block; } -span.ddpbooktitle, span.merchtitle { - font-size: larger; +table.vote td, table.vote th { + padding-right: 1.5em; } -a:link { color: #0000FF; } -a:visited { color: #800080; } -a:hover { color: #F000FF; } -a:active { color: #FF0000; } - -.navpara a, col.y2k { - white-space: nowrap; - /* this is to keep from breaking at whitespace in anchors */ +#maincol.with-toolbox { + margin-right: 14em; } - -/* language dependent stuff */ -/* quotes */ -html[lang="de"] q:before { - content: "\00BB"; +div.tabular table, table.tabular, table.vendors { +/* border-bottom: 1px solid #a9abb3; + border-top: 1px solid #a9abb3; */ + border-bottom: 0.15em solid #666; + border-top: 0.15em solid #666; + width: auto; + font-size: 0.75em; + line-height: 2em; + margin-bottom: 4em; + margin-top: -0.169em; } -html[lang="de"] q:after { - content: "\00AB"; +table td { + padding-right: 1.5em; } -html[lang="de"] q q:before { - content: "\203A"; +div.tabular table tr, table.tabular tr, table.vendors tr { + width: 100%; } -html[lang="de"] q q:after { - content: "\2039"; +table th { + padding-right: 1.5em; } -html[lang="pl"] q:before { content: "\201E"; } -html[lang="pl"] q:after { content: "\201D"; } -html[lang="pl"] q q:after { content: "\2019"; } -html[lang="pl"] q q:before { content: "\201A"; } - -html[lang="fr"] q:before { content: "\00AB\00A0"; } -html[lang="fr"] q:after { content: "\00A0\00BB"; } -html[lang="fr"] q q:before { content: "\2039\00A0"; } -html[lang="fr"] q q:after { content: "\00A0\203A"; } - -#leftcol:lang(ja) ul ul { - font-size: 0.95em; +div.tabular table td, table.tabular td, table.vendors td { + background-image: url(Pics/greydot.png); + background-position: top left; + background-repeat: repeat-x; } -html[lang|="zh"] strong { - /* color: #FFFFFF; */ - background-color: yellow; +div.tabular table > td:fist-child, table.tabular > td:fist-child, table.vendors > td:fist-child { + background-image: none; } -.underline { text-decoration: underline; } -.clr { clear:both; } -/*.content{padding:5px;} */ /*padding for content */ -/* #header .content{padding-bottom:0;} */ /*padding bottom 0 to remove space in IE5 Mac*/ - -/* for l10n-arabic */ -.bidi { - direction: rtl; - text-align: right; +#pageLang p, #pageLang form { + display: inline; } - -#leftcol, #navbar, #navbar a { - -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 */ +.inline a { + float: left; + margin-right: 1em; } diff --git a/static/debpkg.css b/static/debpkg.css new file mode 100644 index 0000000..9b7e6d3 --- /dev/null +++ b/static/debpkg.css @@ -0,0 +1,305 @@ +/* + http://www.debian.org Stylesheet + + Copyright 2011 Kalle Söderman + + This stylesheet is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as published by + the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + Street, Fifth Floor, Boston, MA 02110-1301 USA. + + The license text can also be found at http://www.gnu.org/copyleft/gpl.html and + /usr/share/common-licenses/GPL-2 on Debian GNU/Linux. +*/ + +@import url("debian.css"); + +#footer { + padding-right: 10px; + margin-left: 52px; +} +#pnavbar { + font-size: 0.75em; + background-color: transparent; + background-color: #f5f6f7; + margin:0; + padding: 6px 0.25em 7px 0.25em; + border-bottom: 1px solid #d2d3d7 ; + text-transform:lowercase; + line-height: 1; +} +#pmoreinfo { + width: 20em; + float:right; + padding:0 0 0 0.5em; + margin: 0 0 10px 0.5em; + border-left:1px solid #a9abb3; + font-size: 0.75em; + line-height: 1.5; +} +#pmoreinfo a { + text-decoration: none; +} +#pmoreinfo div.screenshot { + min-height: 120px; +} +#pmoreinfo a:hover { + text-decoration: underline; +} +#pmoreinfo ul { + list-style:none; + margin: 0; +} +#pmoreinfo ul ul { + margin:0; +} +#pmoreinfo li { + font-weight: normal; +} +#pmoreinfo p { +} +#pmoreinfo h2 { + font-size: 1em; + font-weight: bold; + line-height: 2; + margin:0; +} +#pmoreinfo h3 { + font-size: 1em; + font-weight: normal; + line-height: 2; + margin:0; +} +#packagesearch #breadcrumbs { + margin-bottom: 0; +} + +#hpacketsearch form { + margin:0; padding:0; +} +#hpacketsearch { + background: transparent; + display:block; + padding: 1px 3px 1px 0; + text-align: right; +} +.perror +, #psearchtoomanyhits { + padding:0 2em 0 4em; + margin: 1.85em 0 1.85em 0; + background-repeat: no-repeat; + background-position: 0.5em 1em; + font-size: 0.75em; + line-height: 2em; + background-color:#FFFFCB; + border:0.15em solid #CCCCA3; +} +#psearchtoomanyhits { + background-image: url('Pics/admon-note.png'); +} +.perror p { + margin-bottom: 0; +} +div.warning { + background-image: url('Pics/admon-warning.png'); +} +#psearchres h2 { + background-image: url('Pics/reddot.png'); + background-repeat: repeat-x; + background-position: top left; + padding: 0.5em 0 0 0; + margin: 0.5em 0 1em 0; +} +#psearchres +, #pcontentsres { + padding-top: 0; +} +#pcontentsres tr { + text-align: left; +} +#pcontentsres td { + padding-right: 1.5em; +} +#pcontentsres { + margin-bottom: 1.5em; + } +#psearchres ul{ + margin-top:0; +} +#psearchres ul li{ +} +.file { + font-family: monospace; +} +div#pothers { + margin-top:0.25em; + float: right; +} +#pothers a, #pothers strong { +} +#psearchsug { + font-size: 0.75em; + margin: 0; + line-height: 2; + background-image: url('Pics/reddot.png'); + background-repeat: repeat-x; + background-position: bottom left; +} +#psearchsug p { + margin: 0; +} +#psearchsug ul { + margin: 1em 0 1em 0; + } + +/* Package sidebar */ +#ptablist { +} + +/* Package dependencies */ + +#pdeplegend { + font-weight:bold; + padding: 0 0.5em 0 0; + border:1px solid #a9abb3; +} +#pdeplegend img { + margin-left: 1em; +} +#pdeplegend tr,#pdeplegend ul,#pdeplegend li { + margin:0; padding:0; +} +#pdeplegend td { + padding-left: 1.5em; + padding-right: 1em; +} +#pdeps dd { + margin:0; + padding:0; +} +#pdeps dt { +} + +#pdeplegend ul.uldep +, #pdeplegend ul.uladep +, #pdeplegend ul.ulrec +, #pdeplegend ul.ulidep +, #pdeplegend ul.ulsug { + margin-left: 0.5em; + list-style-position: inside; +} + +#pdeps ul.uldep, #pdeps ul.uladep { + list-style-type: disc; + list-style-image: url(Pics/dep.png); +} +#pdeps ul.ulrec, #pdeps ul.ulidep { + list-style-type: square; + list-style-image: url(Pics/rec.png); +} +#pdeps ul.ulsug { + list-style-type: circle; + list-style-image: url(Pics/sug.png); +} +#pdownload { + text-align: left; + margin-right: 18em; +} +#pdownload table { + text-align:left; + margin-bottom: 2em; + border-bottom: 1px solid #a9abb3; + border-top: 1px solid #a9abb3; + width: 100%; +} +#pdeplegend td li { + padding-left:0; +} +#pdeplegend td + ,#pdeplegend tr + ,#pdeplegend table + ,#pdeplegend ul + ,#pdeplegend li + ,#pdeplegend tbody { + margin:0; + padding:0; +} +.pkgreport #pdeplegend td li { + margin:0.25em 0 0 2em; +} +#ptags { + font-size: 0.75em; + margin: 0 22em 0 2em; + line-height: 2; +} +.card { + clear:both; + margin:2em 0 2em 0; + background-position: 0 -50px; + background-repeat: repeat-x; + padding:8px 0 8px 0; +} +.card ul { + margin:0.5em 0 1em 0; +} +.card ul li { + list-style:none; +} +.card h2 { + margin:0; +} +#lefthalfcol { + float:left; + width: 50%; + padding-right: 1em; + margin:0; +} +#righthalfcol { + margin:0; + margin-left:50%; + padding-left: 1em; +} +#lefthalfcol dl +, #righthalfcol dl { + margin-top: 0; +} +#lefthalfcol dd +, #righthalfcol dd { + margin-bottom: 1em; +} +.lefthalf ul { + margin-top:0; +} +strong.pmarker { + padding: 0 0.25em 0 0.25em; +} +span.keyword { + color: #444; + font-weight: bold; + letter-spacing: 0.05em; +} +h1 strong.pmarker { + font-weight: normal; +} +.psearch-other-hits { + margin-top: 1em; +} +table { + border-bottom: 1px solid #a9abb3; + border-top: 1px solid #a9abb3; + } + +td { + background-image: url(Pics/greydot.png); + background-position: top left; + background-repeat: repeat-x; +} +th { +} diff --git a/static/packages-site.css b/static/packages-site.css index dcd43c5..54e9ea6 100644 --- a/static/packages-site.css +++ b/static/packages-site.css @@ -1,5 +1,6 @@ .sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports, -.lenny-volatile, .lenny-backports .squeeze-backports { +.lenny-volatile, .lenny-backports, .lenny-backports-sloppy, +.squeeze-backports { font-size: smaller; } diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl index 3969496..79ee6f4 100644 --- a/templates/config/mirrors.tmpl +++ b/templates/config/mirrors.tmpl @@ -134,7 +134,7 @@ mirrors = { backports => { url => 'http://backports.debian.org/', title => g('newer packages that have been adapted to stable releases of Debian'), - mirror_list => 'http://www.backports.org/debian/README.mirrors.html', + mirror_list => 'http://backports.debian.org/Mirrors/', europa => [ "backports.debian.org/debian-backports", "ftp.at.debian.org/debian-backports/", diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl index 7944c67..5bae698 100644 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@ -43,6 +43,5 @@ Total page evaluation took [% benchmark %]
[% END %] - diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl index f8d520b..08b52bd 100644 --- a/templates/html/head.tmpl +++ b/templates/html/head.tmpl @@ -9,29 +9,42 @@ [% html_meta %] - - - + [% IF rss_alternate %] [% END %] -[%- IF sitewidemsg -%] -
-[%- IF sitewidemsg.title -%]

[% sitewidemsg.title %]

[% END %] -[% sitewidemsg.txt %] -
-[%- END -%] +
[%- IF print_search_field %] [% checked = 'checked="checked"' @@ -57,21 +70,13 @@
[% END %] +[%- IF sitewidemsg -%] +
+[%- IF sitewidemsg.title -%]

[% sitewidemsg.title %]

[% END %] +[% sitewidemsg.txt %] +
+[%- END -%] - - -

[% g('skip the navigation') %]

-
- >> [% organisation %] - >> [% g('Packages') %] -[% FOREACH n IN navigation %] - >> [% IF n.url %][% n.name %][% ELSE %][% n.name %][% END %] -[% END %] -
- - -
-
[%- IF page_title %]

[% page_title %]

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl index b07318c..c40310d 100644 --- a/templates/html/homepage.tmpl +++ b/templates/html/homepage.tmpl @@ -4,7 +4,7 @@ keywords = g('Packages') -%] [%- - all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze', 'squeeze-backports', 'sid' ] + all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'lenny-backports-sloppy', 'squeeze', 'squeeze-backports', 'sid' ] version_numbers = { sarge => '3.1', etch => '4.0', lenny => '5.0' } diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl index 683d8bc..42ee062 100644 --- a/templates/html/search.tmpl +++ b/templates/html/search.tmpl @@ -38,7 +38,7 @@ [% END %] [% END %] -

[% g('Search in specific suite:') %] +

[% g('Limit to suite:') %] [% FOREACH s IN all_suites %] [% IF s != suite_str %] [[% s %]] @@ -51,7 +51,7 @@ make_search_url('',"keywords=$keyword_esc",'suite','all')) %] [% END %] -

[% g('Limit search to a specific architecture:') %] +

[% g('Limit to a architecture:') %] [% FOREACH a IN all_architectures %] [% IF a != arch_str %] [[% a %]] @@ -97,15 +97,19 @@ [% IF too_many_hits %] [% IF opts.searchon != "names" %] -

[% g("Note that this only shows the best matches, sorted by relevance. If the first few packages don't match what you searched for, try using more keywords or alternative keywords.") %]

+
+

[% g("Note that this only shows the best matches, sorted by relevance. If the first few packages don't match what you searched for, try using more keywords or alternative keywords.") %]

+
[% ELSE %] -

+

+

[%- IF results %] [% g("Your keyword was too generic, for optimizing reasons some results might have been suppressed.
Please consider using a longer keyword or more keywords.") %] [%- ELSE -%] [% g("Your keyword was too generic.
Please consider using a longer keyword or more keywords.") %] [% END -%]

+
[% END; END %] [% UNLESS results || too_many_hits %] diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl index 3388fe3..a5ed01c 100644 --- a/templates/html/search_contents.tmpl +++ b/templates/html/search_contents.tmpl @@ -55,7 +55,7 @@ [% END %] [% UNLESS search_architectures.size == 1 || all_architectures.size == 1 %] -

[% g('Limit search to a specific architecture:') %] +

[% g('Limit to a architecture:') %] [% FOREACH a IN all_architectures %] [[% a %]][% END %] [% END %] @@ -85,7 +85,9 @@ [% g('Found %u results.', results.size) %] [% IF too_many_hits %] -

[% g('Note: Your search was too wide so we will only display only the first about 100 matches. Please consider using a longer keyword or more keywords.') %]

+
+

[% g('Note: Your search was too wide so we will only display only the first about 100 matches. Please consider using a longer keyword or more keywords.') %]

+
[% END %] diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl index ebbba77..c380d9f 100644 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@ -64,7 +64,9 @@

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

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

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

    @@ -110,7 +112,7 @@
[% IF src %] -

[% g('Download Source Package %s:', src.url, src.pkg) %] +

[% g('Download Source Package %s:', src.url, src.pkg) %]

[% FOREACH src.downloads %] [% '