X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fhtml%2Fsearch.tmpl;h=683d8bc0435673a6dda87ca2ae0cfaf701f18eb7;hb=HEAD;hp=452e80b169b9e8a3b0a67342334c34eebe95b7ee;hpb=13565c2add3c1f4c501cf0cba64cac10537e2eac;p=deb%2Fpackages.git
diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 452e80b..683d8bc 100644
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -1,4 +1,5 @@
[%- PROCESS 'config/archive_layout.tmpl' -%]
+[%- PROCESS 'config/mirrors.tmpl' -%]
[%- keyword_str = search_keywords.join(' ');
keyword_esc = uri_escape(keyword_str);
keyword_enc = html_encode(keyword_str);
@@ -27,6 +28,7 @@
}
navigation = [ { name => g('Package Search Results') } ]
-%]
+[%- PROCESS 'html/util.inc' -%]
[% UNLESS results %]
@@ -66,7 +68,7 @@
[% IF opts.searchon == "names" && non_results %]
[% g('Some results have not been displayed due to the search parameters.',
- "$search_url$keyword_esc") %]
+ "$search_url?keywords=$keyword_esc") %]
[% END %]
@@ -99,7 +101,7 @@
[% ELSE %]
[%- IF results %]
-[% g("Your keyword was too generic, for optimizing reasons some results might have been supressed.
Please consider using a longer keyword or more keywords.") %]
+[% 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 -%]
@@ -117,11 +119,13 @@
[% g('Package %s', pkg) %]
[% FOREACH s IN suites;
- suite = s.suite %]
+ suite = s.suite ; section = s.section %]
- [% suite %]
- [%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %][% ' (' _ s.subsection _ ')' IF s.subsection %]: [% IF s.trans_desc.$lang; s.trans_desc.$lang | html; ELSE; s.desc | html; END %] [%- IF s.section && s.section != main_section %] [[% s.section %]][% END %]
+ [%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %][% ' (' _ s.subsection _ ')' IF s.subsection %]:
+ [% PROCESS desc_i18n trans_desc=s.trans_desc desc=s.desc %]
+ [%- PROCESS marker text=section title=section_titles.$section url=section_urls.$section IF section && section != main_section %]
[% FOREACH s.versions %]
-
[% version %] [%- IF archive != main_archive %] [[% archive %]][% END %]: [% architectures.join(' ') %]
+
[% version %] [%- IF archive != main_archive %] [[% IF mirrors.$archive.url %][% END %][% archive %][% IF mirrors.$archive.url %][% END %]][% END %]: [% architectures.join(' ') %]
[% END %]
[% IF s.providers %]
[% IF s.versions.size > 0; g('also provided by:'); ELSE; g('provided by:'); END %]
@@ -139,8 +143,7 @@
[% origin = (archive == main_archive) ? suite : "$suite/$archive";
js_id = string2id("$pkg$suite$archive") %]
- [% origin %] ([% subsection %]): [% version %]
- [%- IF section %] [[% section %]][% END %]
- [%- IF real_archive %] [[% real_archive %]][% END %]
+ [%- PROCESS marker text=section title=section_titles.$section url=section_urls.$section IF section %] [%- PROCESS marker text=real_archive title=mirrors.$real_archive.title url=mirrors.$real_archive.url IF real_archive %]
[% g('Binary packages:') %] [% FOREACH binary IN binaries.sort %][% binary %][% ', ' UNLESS loop.last %][% END %]
[% IF binaries.size > 10 %]