Packages::CGI: Remove support for msgs and notes

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

diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl
index 2deef0bb7ee0839c44a8c7b6ef0de7d574842118..71a0019362946b713ef6c126635747c19fc9bcc6 100644 (file)
--- 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 %]
@@ -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' -%]