X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fsearch.tmpl;h=78b4786a2f8fc50bfee765a69ce3dd09f2c87dec;hb=e454ca3e9cd32ded30b5ee29302119ccd28d71ee;hp=33a0b4256d4391cf43d8976d0a346b3c1395a4e4;hpb=78bc1557047b7d0aae38e959f233b8c073f0a8b1;p=deb%2Fpackages.git

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 33a0b42..78b4786 100644
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -1,18 +1,5 @@
 [%- PROCESS 'config/archive_layout.tmpl' -%]
-[%- PROCESS 'html/head.tmpl'
-   title_tag = 'Debian Package Search Results'
-   print_search_field = 'packages'
-   search_field_values = {
-	keywords => search_keywords.join(' '),
-	searchon => opts.searchon_form,
-	suite => params.values.suite.no_replace.join(','),
-	architectures => params.values.arch.no_replace.join(','),
-	sections => params.values.section.no_replace.join(','),
-    }
-   navigation = [ { name => 'Package Search Results' } ]
--%]
-
-[% keyword_str = search_keywords.join(' ');
+[%- keyword_str = search_keywords.join(' ');
    keyword_esc = uri_escape(keyword_str);
    keyword_enc = html_encode(keyword_str);
 
@@ -27,7 +14,19 @@
    architectures_str = params.values.arch.no_replace.join(', ');
    architectures_esc = uri_escape(architectures_str);
    architectures_enc = html_encode(architectures_str);
-%]
+-%]
+[%- PROCESS 'html/head.tmpl'
+   title_tag = "Package Search Results -- $keyword_enc"
+   print_search_field = 'packages'
+   search_field_values = {
+	keywords => search_keywords.join(' '),
+	searchon => opts.searchon_form,
+	suite => params.values.suite.no_replace.join(','),
+	architectures => params.values.arch.no_replace.join(','),
+	sections => params.values.section.no_replace.join(','),
+    }
+   navigation = [ { name => 'Package Search Results' } ]
+-%]
 
 <div id="psearchsug">
 [% UNLESS results %]
@@ -65,10 +64,15 @@ Found <strong>[% results %]</strong> matching packages.</p>
 [% END %]
 
 [% IF too_many_hits %]
+[% IF opts.searchon != "names" %]
+<p id="psearchtoomanyhits">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>
+[% ELSE %]
 <p id="psearchtoomanyhits">Your search was too wide so we will only display exact matches.
 At least <em>[% too_many_hits %]</em> results have been omitted and will not be displayed.
 Please consider using a longer keyword or more keywords.</p>
-[% END %]
+[% END; END %]
 
 [% UNLESS results %]
 <p id="psearchnoresult">Sorry, your search gave no results</p>
@@ -80,8 +84,10 @@ Please consider using a longer keyword or more keywords.</p>
 [% FOREACH packages %]
   <h3>Package [% pkg %]</h3>
   <ul>
-  [% FOREACH s IN suites %]
-    <li class="[% s.suite %]"><a class="resultlink" href="[% make_url(pkg,'','suite',s.suite,'arch','','section','') %]">[% s.suite %]</a>[% ' (' _ s.subsection _ ')' IF s.subsection %]: [% s.desc %]  [%- IF s.section != main_section %] [<strong class="pmarker">[% s.section %]</strong>][% END %]
+  [% FOREACH s IN suites;
+	suite = s.suite %]
+    <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 %]: [% s.desc %]  [%- IF s.section != main_section %] [<strong class="pmarker">[% s.section %]</strong>][% END %]
     [% FOREACH s.versions %]
       <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
     [% END %]
@@ -118,3 +124,5 @@ Please consider using a longer keyword or more keywords.</p>
 [% END %]
 
 </div>
+
+[%- PROCESS 'html/foot.tmpl' -%]