Remove mistaken closing div

[deb/packages.git] / templates / html / search.tmpl

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 41ca369cf1c3d6794f6b731155e4708f7d8261be..317d424ccfea4a0700ae1a618a43debaba739b1d 100644 (file)
--- 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);
@@ -37,7 +38,7 @@
        [% END %]
 [% END %]
 
-<p>[% g('Search in specific suite:') %]
+<p>[% g('Limit to suite:') %]
 [% FOREACH s IN all_suites %]
        [% IF s != suite_str %]
        [<a href="[% make_search_url('',"keywords=$keyword_esc",'suite',s) %]">[% s %]</a>]
@@ -50,7 +51,7 @@
        make_search_url('',"keywords=$keyword_esc",'suite','all')) %]
 [% END %]
 
-<p>[% g('Limit search to a specific architecture:') %]
+<p>[% g('Limit to a architecture:') %]
 [% FOREACH a IN all_architectures %]
    [% IF a != arch_str %]
    [<a href="[% make_search_url('',"keywords=$keyword_esc",'arch',a) %]">[% a %]</a>]
@@ -67,9 +68,8 @@
 
 [% 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>
 
 [%- PROCESS 'html/messages.tmpl' -%]
 
@@ -96,15 +96,19 @@
 
 [% IF too_many_hits %]
 [% IF opts.searchon != "names" %]
-<p id="psearchtoomanyhits">[% 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.") %]</p>
+<div class="note">
+<p>[% 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.") %]</p>
+</div>
 [% ELSE %]
-<p id="psearchtoomanyhits">
+<div class="note">
+<p>
 [%- 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 -%]
 </p>
+</div>
 [% END; END %]
 
 [% UNLESS results || too_many_hits %]
@@ -118,13 +122,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 %]:
        [% PROCESS desc_i18n trans_desc=s.trans_desc desc=s.desc %]
-       [%- PROCESS marker text=s.section IF s.section && s.section != main_section %]
+       [%- 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 %]
@@ -142,7 +146,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 %]
-      [%- PROCESS marker text=section IF section %] [%- PROCESS marker text=real_archive IF real_archive %]
+      [%- 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>