X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fsearch_contents.tmpl;h=71a0019362946b713ef6c126635747c19fc9bcc6;hb=e2881c2279414d845cb0b21b5e2661924194cb77;hp=7b794ac18d80c850b25b2c9d14b8db6464609b3c;hpb=2ec757bb58907b15c43548be5601d4f2b8c7caac;p=deb%2Fpackages.git

diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl
index 7b794ac..71a0019 100644
--- a/templates/html/search_contents.tmpl
+++ b/templates/html/search_contents.tmpl
@@ -1,8 +1,20 @@
+[%- 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);
+
+   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 = "$organisation Package Contents Search Results"
+   title_tag = "Package Contents Search Results -- $keyword_enc"
    keywords = "$suite"
    print_search_field = 'packages'
-   navigation = [ { title => '', name => 'Packages Contents Search Results', url => '' } ]
+   navigation = [ { title => '', name => 'Package Contents Search Results', url => '' } ]
    search_field_values = {
 	keywords => search_keywords.join(' '),
 	searchon => 'contents',
@@ -14,18 +26,6 @@
    }
 -%]
 
-[% 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);
-
-   architectures_str = params.values.arch.no_replace.join(', ');
-   architectures_esc = uri_escape(architectures_str);
-   architectures_enc = html_encode(architectures_str);
-%]
 <div id="psearchsug">
 
 <ul class="linklist">
@@ -44,7 +44,11 @@
 
 <p>Search in other suite:
 [% FOREACH s IN all_suites %]
-[<a href="[% make_search_url('',"keywords=$keyword_esc",'suite',s) %]">[% s  %]</a>]
+	[% IF s != suite %]
+	[<a href="[% make_search_url('',"keywords=$keyword_esc",'suite',s) %]">[% s  %]</a>]
+	[% ELSE %]
+	[[% s %]]
+	[% END %]
 [% END %]
 
 [% UNLESS search_architectures.size == 1 || all_architectures.size == 1 %]
@@ -53,7 +57,7 @@
 [% END %]
 
 [% IF search_architectures.size == 1 %]
-<p>Search in <a href="[% make_search_url('',"keywords=$keyword_esc",arch,'') %]">all architectures</a>
+<p>Search in <a href="[% make_search_url('',"keywords=$keyword_esc",'arch','any') %]">all architectures</a>
 [% END %]
 
 </div>
@@ -72,7 +76,7 @@
    END %]
 <p>You have searched for [% wording %] <em>[% keyword_enc %]</em> in [% suite_wording %], [% section_wording %], and [% arch_wording %].
 
-[% IF results %]
+[% IF results.size %]
 Found <strong>[% results.size %] results</strong>.
 
 [% IF too_many_hits %]
@@ -87,7 +91,7 @@ Please consider using a longer keyword or more keywords.</p>
 	</colgroup>
 <tr>
 	<th><a title="Sort results by filename" href="[% make_search_url('',"keywords=$keyword_esc&amp;sort_by=file") %]">File</a></th>
-	<th><a title="Sort results by package name" href="[% make_search_url('',"keywords=$keyword_esc&amp;sort_by=pkg") %]">Packages</th>
+	<th><a title="Sort results by package name" href="[% make_search_url('',"keywords=$keyword_esc&amp;sort_by=pkg") %]">Packages</a></th>
 </tr>
 [% FOREACH results %]
 [% file = html_encode(file);
@@ -121,3 +125,5 @@ Please consider using a longer keyword or more keywords.</p>
 <p id="psearchnoresult">Sorry, your search gave no results</p>
 
 [% END %]
+
+[%- PROCESS 'html/foot.tmpl' -%]