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

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index e5105bf..78b4786 100644
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -1,22 +1,93 @@
 [%- PROCESS 'config/archive_layout.tmpl' -%]
+[%- keyword_str = search_keywords.join(' ');
+   keyword_esc = uri_escape(keyword_str);
+   keyword_enc = html_encode(keyword_str);
+
+   section_str = params.values.section.no_replace.join(', ');
+   section_esc = uri_escape(section_str);
+   section_enc = html_encode(section_str);
+
+   suite_str = params.values.suite.no_replace.join(', ');
+   suite_esc = uri_escape(suite_str);
+   suite_enc = html_encode(suite_str);
+
+   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 = 'Debian Package Search Results'
+   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 %]
+	<p>You can try a different search on the <a href="[% searchformurl %]#search_packages">Packages search page</a>.</p>
+	
+	[% IF opts.searchon != "names" && opts.exact %]
+	<p>You have searched only for words exactly matching your keywords.
+	You can try to search <a href="[% make_search_url('',"keywords=$keyword_esc",'exact',0) %]">allowing subword matching</a>
+	[% END %]
+[% END %]
+[% IF opts.searchon == "names" && non_results %]
+<p><a href="[% search_url %][% keyword_esc %]">[% non_results %]</a>
+results have not been displayed due to the search parameters.</p>
+[% END %]
+</div>
+
 [%- PROCESS 'html/messages.tmpl' -%]
 
 <div id="psearchres">
-<p>Found <em>[% results %]</em> matching packages.</p>
+
+[% suite_wording = suite_enc.match("^(default|all)$") ? "all suites" : "suite(s) <em>$suite_enc</em>";
+   section_wording = (section_enc == 'all') ? "all sections" : "section(s) <em>$section_enc</em>";
+   arch_wording = (architectures_enc == 'any') ? "all architectures" : "architecture(s) <em>$architectures_enc</em>";
+    IF opts.searchon == "names";
+	source_wording = opts.source ? "source packages" : "packages";
+	msg = "You have searched for $source_wording that names contain <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording .";
+    ELSE;
+	exact_wording = opts.exact ? "" : " (including subword matching)";
+	msg = "You have searched for <em>$keyword_enc</em> in packages names and descriptions in $suite_wording, $section_wording, and $arch_wording$exact_wording .";
+    END %]
+<p>[% msg %]
+
+[% IF results %]
+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 %]
+
+[% UNLESS results %]
+<p id="psearchnoresult">Sorry, your search gave no results</p>
+[% END %]
+
 [% FOREACH categories %]
   [% "<h2>$name</h2>" IF name %]
 
 [% FOREACH packages %]
   <h3>Package [% pkg %]</h3>
   <ul>
-  [% FOREACH s IN suites %]
-    <li><a class="resultlink" href="[% make_url(pkg,'','suite',s.suite) %]">[% s.suite %]</a>[% ' (' _ s.subsect _ ')' IF s.subsect %]: [% 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 %]
@@ -34,10 +105,10 @@
   [% FOREACH origins %]
      [% 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) %]">[% origin %]</a> ([% subsection %]): [% version %]
+    <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 %]
-    <br>Binary packages: <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive) %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
+    <br>Binary packages: <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries %]<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 %]","[% binaries.size %] binary packages")</script>
 	[% END %]
@@ -49,7 +120,9 @@
 [% END %]
 
 [% IF skipped %]
-  <p><a href="[% make_search_url('',"keywords=$keywords",'exact', 0) %]">[% skipped %]</a> results have not been displayed because you requested only exact matches.
+  <p><a href="[% make_search_url('',"keywords=$keyword_esc",'exact', 0) %]">[% skipped %]</a> results have not been displayed because you requested only exact matches.
 [% END %]
 
 </div>
+
+[%- PROCESS 'html/foot.tmpl' -%]