X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fsearch.tmpl;h=683d8bc0435673a6dda87ca2ae0cfaf701f18eb7;hb=a9572ccb0c5930c582e93d901cc4e6d76cee0d45;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' -%]
 
 <div id="psearchsug">
 [% UNLESS results %]
@@ -66,7 +68,7 @@
 
 [% IF opts.searchon == "names" && non_results %]
 <p>[% g('<a href="%s">Some</a> results have not been displayed due to the search parameters.',
-	"$search_url$keyword_esc") %]</p>
+	"$search_url?keywords=$keyword_esc") %]</p>
 [% END %]
 </div>
 
@@ -99,7 +101,7 @@
 [% ELSE %]
 <p id="psearchtoomanyhits">
 [%- IF results %]
-[% g("Your keyword was too generic, for optimizing reasons some results might have been supressed.<br>Please consider using a longer keyword or more keywords.") %]
+[% g("Your keyword was too generic, for optimizing reasons some results might have been suppressed.<br>Please consider using a longer keyword or more keywords.") %]
 [%- ELSE -%]
 [% g("Your keyword was too generic.<br>Please consider using a longer keyword or more keywords.") %]
 [% END -%]
@@ -117,11 +119,13 @@
   <h3>[% g('Package %s', pkg) %]</h3>
   <ul>
   [% FOREACH s IN suites;
-	suite = s.suite %]
+	suite = s.suite ; section = s.section %]
     <li class="[% suite %]"><a class="resultlink" href="[% make_url(pkg,'','suite',suite,'arch','','section','') %]">[% suite %]
-	[%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %]</a>[% ' (' _ 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 %] [<strong class="pmarker">[% s.section %]</strong>][% END %]
+	[%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %]</a>[% ' (' _ 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 %]
-      <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
+      <br>[% version %] [%- IF archive != main_archive %] [[% IF mirrors.$archive.url %]<a href="[% mirrors.$archive.url %]">[% END %]<strong class="pmarker" title="[% mirrors.$archive.title %]">[% archive %]</strong>[% IF mirrors.$archive.url %]</a>[% END %]][% END %]: [% architectures.join(' ') %]
     [% END %]
     [% IF s.providers %]
 	<br>[% 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")  %]
     <li><a class="resultlink" href="[% make_url(pkg,'','source','source','suite',origin,'section','','arch','') %]">[% origin %]</a> ([% subsection %]): [% version %]
-      [%- IF section %] [<strong class="pmarker">[% section %]</strong>][% END %]
-      [%- IF real_archive %] [<strong class="pmarker">[% real_archive %]</strong>][% 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 %]
     <br>[% g('Binary packages:') %] <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries.sort %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
 	[% IF binaries.size > 10 %]
 	<script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('show %u binary packages', binaries.size) %]","[% g('hide %u binary packages', binaries.size) %]")</script>