View | Details | Raw Unified | Return to bug 16111
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt (-4 / +4 lines)
Lines 7-26 Link Here
7
   <Tags>koha opac [% LibraryName |html %]</Tags>
7
   <Tags>koha opac [% LibraryName |html %]</Tags>
8
   <Contact>[% KohaAdminEmailAddress |html %]</Contact>
8
   <Contact>[% KohaAdminEmailAddress |html %]</Contact>
9
   <Url type="application/rss+xml"
9
   <Url type="application/rss+xml"
10
        template="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&amp;pw={startPage?}&amp;format=rss2"/>
10
        template="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&amp;pw={startPage?}&amp;format=rss"/>
11
</OpenSearchDescription>
11
</OpenSearchDescription>
12
12
13
[% ELSE %]
13
[% ELSE %]
14
14
15
[% IF ( rss2 ) %]
15
[% IF ( rss ) %]
16
<rss version="2.0"
16
<rss version="2.0"
17
      xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
17
      xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
18
      xmlns:dc="http://purl.org/dc/elements/1.1/"
18
      xmlns:dc="http://purl.org/dc/elements/1.1/"
19
      xmlns:atom="http://www.w3.org/2005/Atom">
19
      xmlns:atom="http://www.w3.org/2005/Atom">
20
   <channel>
20
   <channel>
21
     <title><![CDATA[[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]]]></title>
21
     <title><![CDATA[[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]]]></title>
22
     <link>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2</link>
22
     <link>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss</link>
23
     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;sort_by=[% sort_by | uri %]&amp;format=rss2"/>
23
     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;sort_by=[% sort_by | uri %]&amp;format=atom"/>
24
     <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %] at [% LibraryName |html %]]]></description>
24
     <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %] at [% LibraryName |html %]]]></description>
25
     <opensearch:totalResults>[% total %]</opensearch:totalResults>
25
     <opensearch:totalResults>[% total %]</opensearch:totalResults>
26
     <opensearch:startIndex>[% offset %]</opensearch:startIndex>
26
     <opensearch:startIndex>[% offset %]</opensearch:startIndex>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-3 / +3 lines)
Lines 17-23 Link Here
17
    [% END %]
17
    [% END %]
18
[% END %]
18
[% END %]
19
19
20
<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS feed" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |uri %]&amp;count=[% countrss |uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
20
<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS feed" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |uri %]&amp;count=[% countrss |uri %]&amp;sort_by=acqdate_dsc&amp;format=rss" />
21
</head>
21
</head>
22
22
23
[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]
23
[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]
Lines 42-48 Link Here
42
                        <strong>No results found!</strong>
42
                        <strong>No results found!</strong>
43
                        <p>
43
                        <p>
44
                            [% IF ( searchdesc ) %]
44
                            [% IF ( searchdesc ) %]
45
                                No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
45
                                No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&amp;format=rss" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
46
                            [% ELSE %]
46
                            [% ELSE %]
47
                                You did not specify any search criteria.
47
                                You did not specify any search criteria.
48
                            [% END %]
48
                            [% END %]
Lines 86-92 Link Here
86
                                [% END %]
86
                                [% END %]
87
                            ).
87
                            ).
88
                        [% END %]
88
                        [% END %]
89
                        <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a>
89
                        <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a>
90
                    [% END # / IF total %]
90
                    [% END # / IF total %]
91
                    </p>
91
                    </p>
92
                [% END # / IF searchdesc %]
92
                [% END # / IF searchdesc %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt (-3 / +2 lines)
Lines 69-75 Link Here
69
                                                    <tr>
69
                                                    <tr>
70
                                                        <td><input type="checkbox" name="id" value="[% s.id %]" /></td>
70
                                                        <td><input type="checkbox" name="id" value="[% s.id %]" /></td>
71
                                                        <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
71
                                                        <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
72
                                                        <td><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
72
                                                        <td><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
73
                                                        <td>[% s.total %]</td>
73
                                                        <td>[% s.total %]</td>
74
                                                    </tr>
74
                                                    </tr>
75
                                                [% END %]
75
                                                [% END %]
Lines 109-115 Link Here
109
                                                <tr>
109
                                                <tr>
110
                                                    <td><input type="checkbox" name="id" value="[% s.id %]" /></td>
110
                                                    <td><input type="checkbox" name="id" value="[% s.id %]" /></td>
111
                                                    <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
111
                                                    <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
112
                                                    <td><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
112
                                                    <td><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
113
                                                    <td>[% s.total %]</td>
113
                                                    <td>[% s.total %]</td>
114
                                                </tr>
114
                                                </tr>
115
                                            [% END %]
115
                                            [% END %]
116
- 

Return to bug 16111