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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-14 / +15 lines)
Lines 1-4 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% PROCESS 'search-xlate.inc' %]
2
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
3
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
3
<div id="wrap">
4
<div id="wrap">
4
    <div id="header-region" class="noprint">
5
    <div id="header-region" class="noprint">
Lines 168-208 Link Here
168
                                    <option value="">Library catalog</option>
169
                                    <option value="">Library catalog</option>
169
                                [% END # /ms_kw %]
170
                                [% END # /ms_kw %]
170
                                [% IF ( ms_ti ) %]
171
                                [% IF ( ms_ti ) %]
171
                                    <option selected="selected" value="ti">Title</option>
172
                                    <option selected="selected" value="ti">[% search_xlate.item("ti") %]</option>
172
                                [% ELSE %]
173
                                [% ELSE %]
173
                                    <option value="ti">Title</option>
174
                                    <option value="ti">[% search_xlate.item("ti") %]</option>
174
                                [% END # /ms_ti %]
175
                                [% END # /ms_ti %]
175
                                [% IF ( ms_au ) %]
176
                                [% IF ( ms_au ) %]
176
                                    <option selected="selected" value="au">Author</option>
177
                                    <option selected="selected" value="au">[% search_xlate.item("au") %]</option>
177
                                [% ELSE %]
178
                                [% ELSE %]
178
                                    <option value="au">Author</option>
179
                                    <option value="au">[% search_xlate.item("au") %]</option>
179
                                [% END # /ms_au%]
180
                                [% END # /ms_au%]
180
                                [% IF ( ms_su ) %]
181
                                [% IF ( ms_su ) %]
181
                                    <option selected="selected" value="su">Subject</option>
182
                                    <option selected="selected" value="su">[% search_xlate.item("su") %]</option>
182
                                [% ELSE %]
183
                                [% ELSE %]
183
                                    <option value="su">Subject</option>
184
                                    <option value="su">[% search_xlate.item("su") %]</option>
184
                                [% END # /ms_su %]
185
                                [% END # /ms_su %]
185
                                [% IF ( ms_nb ) %]
186
                                [% IF ( ms_nb ) %]
186
                                    <option selected="selected" value="nb">ISBN</option>
187
                                    <option selected="selected" value="nb">[% search_xlate.item("nb") %]</option>
187
                                [% ELSE %]
188
                                [% ELSE %]
188
                                    <option value="nb">ISBN</option>
189
                                    <option value="nb">[% search_xlate.item("nb") %]</option>
189
                                [% END # /ms_nb%]
190
                                [% END # /ms_nb%]
190
                                [% IF ( ms_se ) %]
191
                                [% IF ( ms_se ) %]
191
                                    <option selected="selected" value="se">Series</option>
192
                                    <option selected="selected" value="se">[% search_xlate.item("se") %]</option>
192
                                [% ELSE %]
193
                                [% ELSE %]
193
                                    <option value="se">Series</option>
194
                                    <option value="se">[% search_xlate.item("se") %]</option>
194
                                [% END # /ms_se %]
195
                                [% END # /ms_se %]
195
                                [% IF ( numbersphr ) %]
196
                                [% IF ( numbersphr ) %]
196
                                    [% IF ( ms_callnum ) %]
197
                                    [% IF ( ms_callnum ) %]
197
                                            <option selected="selected" value="callnum,phr">Call number</option>
198
                                            <option selected="selected" value="callnum,phr">[% search_xlate.item("callnum") %]</option>
198
                                    [% ELSE %]
199
                                    [% ELSE %]
199
                                        <option value="callnum,phr">Call number</option>
200
                                        <option value="callnum,phr">[% search_xlate.item("callnum") %]</option>
200
                                    [% END #/ms_callnum %]
201
                                    [% END #/ms_callnum %]
201
                                [% ELSE %]
202
                                [% ELSE %]
202
                                    [% IF ( ms_callnum ) %]
203
                                    [% IF ( ms_callnum ) %]
203
                                        <option selected="selected" value="callnum">Call number</option>
204
                                        <option selected="selected" value="callnum">[% search_xlate.item("callnum") %]</option>
204
                                    [% ELSE %]
205
                                    [% ELSE %]
205
                                        <option value="callnum">Call number</option>
206
                                        <option value="callnum">[% search_xlate.item("callnum") %]</option>
206
                                    [% END # /ms_callnum %]
207
                                    [% END # /ms_callnum %]
207
                                [% END # /numbersphr %]
208
                                [% END # /numbersphr %]
208
                                </select>
209
                                </select>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search-xlate.inc (+43 lines)
Line 0 Link Here
1
[%
2
    search_xlate = {
3
        "kw" => "Keyword"
4
        "su" => "Subject"
5
        "su-br" => "Subject and broader terms"
6
        "su-na" => "Subject and narrower terms"
7
        "su-rl" => "Subject and related terms"
8
        "ti" => "Title"
9
        "se" => "Series"
10
        "se,wrdl" => "Series title"
11
        "callnum" => "Call Number"
12
        "location" => "Shelving Location"
13
        "au" => "Author"
14
        "cpn" => "Corporate name"
15
        "cfn" => "Conference name"
16
        "pn" => "Personal name"
17
        "nt" => "Notes/Comments"
18
        "curriculum" => "Curriculum"
19
        "pb" => "Publisher"
20
        "pl" => "Publisher Location"
21
        "sn" => "Standard Number"
22
        "nb" => "ISBN"
23
        "ns" => "ISSN"
24
        "bc" => "Barcode"
25
    }
26
    limit_xlate = {
27
        "mc-itype" => "Type"
28
        "ln" => "Language"
29
        "branch" => "Branch"
30
        "aud" => "Audience"
31
        "l-format" => "Format"
32
        "ctype" => "Content Type"
33
        "yr" => "Year"
34
    }
35
    qualifier_xlate = {
36
        "wrdl" => ""
37
        "phr" => "phrase"
38
        "st-numeric" => ""
39
        "ge=" => ">="
40
        "le=" => "<="
41
        "rtrn" => ""
42
    }
43
%]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt (-29 / +30 lines)
Lines 1-4 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% PROCESS 'search-xlate.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Advanced search</title>
4
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Advanced search</title>
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
Lines 41-94 Link Here
41
                                    [% END %]
42
                                    [% END %]
42
                                    [% IF ( expanded_options ) %][% left_content %][% END %]
43
                                    [% IF ( expanded_options ) %][% left_content %][% END %]
43
                                    <select name="idx" id="search-field_[% loop.index %]">
44
                                    <select name="idx" id="search-field_[% loop.index %]">
44
                                        <option value="kw">Keyword</option>
45
                                        <option value="kw">[% search_xlate.item("kw") %]</option>
45
                                        <option value="su,wrdl">Subject</option>
46
                                        <option value="su,wrdl">[% search_xlate.item("su") %]</option>
46
                                        [% IF ( expanded_options ) %]
47
                                        [% IF ( expanded_options ) %]
47
                                            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject phrase</option>
48
                                            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("su") %] [% qualifier_xlate.item("phr") %]</option>
48
                                            <option value="su-br">&nbsp;&nbsp;&nbsp;&nbsp; Subject and broader terms</option>
49
                                            <option value="su-br">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("su-br") %]</option>
49
                                            <option value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; Subject and narrower terms</option>
50
                                            <option value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("su-na") %]</option>
50
                                            <option value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; Subject and related terms</option>
51
                                            <option value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("su-rl") %]</option>
51
                                        [% END %]
52
                                        [% END %]
52
                                        <option value="ti">Title</option>
53
                                        <option value="ti">[% search_xlate.item("ti") %]</option>
53
                                        [% IF ( expanded_options ) %]
54
                                        [% IF ( expanded_options ) %]
54
                                            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title phrase</option>
55
                                            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("ti") %] [% qualifier_xlate.item("phr") %]</option>
55
                                            <option value="se,wrdl">Series title</option>
56
                                            <option value="se,wrdl">[% search_xlate.item("se,wrdl") %]</option>
56
                                            [% IF ( numbersphr) %]
57
                                            [% IF ( numbersphr) %]
57
                                                <option value="callnum,phr">Call number</option>
58
                                                <option value="callnum,phr">[% search_xlate.item("callnum") %]</option>
58
                                            [% ELSE %]
59
                                            [% ELSE %]
59
                                                <option value="callnum">Call number</option>
60
                                                <option value="callnum">[% search_xlate.item("callnum") %]</option>
60
                                            [% END %]
61
                                            [% END %]
61
                                            <option value="location">Shelving location</option>
62
                                            <option value="location">[% search_xlate.item("location") %]</option>
62
                                        [% END %]
63
                                        [% END %]
63
                                        <option value="au,wrdl">Author</option>
64
                                        <option value="au,wrdl">[% search_xlate.item("au") %]</option>
64
                                        [% IF ( expanded_options ) %]
65
                                        [% IF ( expanded_options ) %]
65
                                            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author phrase</option>
66
                                            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("au") %] [% qualifier_xlate.item("phr") %]</option>
66
                                            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
67
                                            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("cpn") %]</option>
67
                                            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
68
                                            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("cfn") %]</option>
68
                                            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name phrase</option>
69
                                            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("cfn") %] [% qualifier_xlate.item("phr") %]</option>
69
                                            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
70
                                            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("pn") %]</option>
70
                                            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name phrase</option>
71
                                            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("pn") %] [% qualifier_xlate.item("phr") %]</option>
71
                                        [% END %]
72
                                        [% END %]
72
                                        [% IF ( expanded_options ) %]
73
                                        [% IF ( expanded_options ) %]
73
                                            <option value="nt">Notes/Comments</option>
74
                                            <option value="nt">[% search_xlate.item("nt") %]</option>
74
                                            [% IF (marcflavour != 'UNIMARC') %]
75
                                            [% IF (marcflavour != 'UNIMARC') %]
75
                                                <option value="curriculum">Curriculum</option>
76
                                                <option value="curriculum">[% search_xlate.item("curriculum") %]</option>
76
                                            [% END %]
77
                                            [% END %]
77
                                        [% END %]
78
                                        [% END %]
78
                                        <option value="pb,wrdl">Publisher</option>
79
                                        <option value="pb,wrdl">[% search_xlate.item("pb") %]</option>
79
                                        <option value="pl,wrdl">Publisher location</option>
80
                                        <option value="pl,wrdl">[% search_xlate.item("pl") %]</option>
80
                                        [% IF ( expanded_options ) %]
81
                                        [% IF ( expanded_options ) %]
81
                                            [% IF ( numbersphr) %]
82
                                            [% IF ( numbersphr) %]
82
                                                <option value="sn,phr">Standard number</option>
83
                                                <option value="sn,phr">[% search_xlate.item("sn") %]</option>
83
                                            [% ELSE %]
84
                                            [% ELSE %]
84
                                                <option value="sn">Standard number</option>
85
                                                <option value="sn">[% search_xlate.item("sn") %]</option>
85
                                            [% END %]
86
                                            [% END %]
86
                                            <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
87
                                            <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("nb") %]</option>
87
                                            <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
88
                                            <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; [% search_xlate.item("ns") %]</option>
88
                                        [% ELSE %]
89
                                        [% ELSE %]
89
                                            <option value="nb">ISBN</option>
90
                                            <option value="nb">[% search_xlate.item("nb") %]</option>
90
                                        [% END %]
91
                                        [% END %]
91
                                        <option value="bc">Barcode</option>
92
                                        <option value="bc">[% search_xlate.item("bc") %]</option>
92
                                    </select>
93
                                    </select>
93
                                    <input type="text" size="30" name="q" title="Enter search terms" value="" />
94
                                    <input type="text" size="30" name="q" title="Enter search terms" value="" />
94
                                    [% IF ( expanded_options ) %]
95
                                    [% IF ( expanded_options ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-12 / +37 lines)
Lines 1-14 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% PROCESS 'search-xlate.inc' %]
2
[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnList ) %]
3
[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnList ) %]
3
[% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnList ) %]
4
[% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnList ) %]
4
5
6
[%
7
IF searchdesc;
8
    search_result_str = "Results of search";
9
    IF query_desc;
10
        search_result_str = search_result_str _ " for '";
11
        query_desc_xlate = query_desc;
12
        FOREACH pair IN search_xlate.pairs;
13
            query_desc_xlate = query_desc_xlate.replace(pair.key _ ':', pair.value _ ':');
14
            query_desc_xlate = query_desc_xlate.replace(pair.key _ ',wrdl:', pair.value _ ':');
15
            query_desc_xlate = query_desc_xlate.replace(pair.key _ ',phr:', pair.value _ ' ' _ qualifier_xlate.phr _ ':');
16
        END;
17
        search_result_str = search_result_str _ query_desc_xlate _ "'";
18
    END;
19
    IF limit_desc;
20
        search_result_str = search_result_str _ " with limit(s): '";
21
        limit_desc_xlate = limit_desc;
22
        FOREACH pair IN limit_xlate.pairs;
23
            limit_desc_xlate = limit_desc_xlate.replace(pair.key _ ':', pair.value _ ':');
24
            limit_desc_xlate = limit_desc_xlate.replace(pair.key _ ',', pair.value _ ',');
25
        END;
26
        FOREACH pair IN qualifier_xlate.pairs;
27
            IF pair.value;
28
                replacement_str = ' ' _ pair.value;
29
            ELSE;
30
                replacement_str = '';
31
            END;
32
            limit_desc_xlate = limit_desc_xlate.replace(',' _ pair.key, replacement_str);
33
        END;
34
        search_result_str = search_result_str _ limit_desc_xlate _ "'";
35
    END;
36
ELSE;
37
    search_result_str = "You did not specify any search criteria.";
38
END;
39
%]
5
[% INCLUDE 'doc-head-open.inc' %]
40
[% INCLUDE 'doc-head-open.inc' %]
6
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
41
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; [% search_result_str | html %]</title>
7
[% IF ( searchdesc ) %]
8
    Results of search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
9
[% ELSE %]
10
    You did not specify any search criteria.
11
[% END %]</title>
12
[% INCLUDE 'doc-head-close.inc' %]
42
[% INCLUDE 'doc-head-close.inc' %]
13
[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %]
43
[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %]
14
    [% BLOCK cssinclude %]
44
    [% BLOCK cssinclude %]
Lines 26-36 Link Here
26
        <ul class="breadcrumb">
56
        <ul class="breadcrumb">
27
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
57
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
28
            <li>
58
            <li>
29
                [% IF ( searchdesc ) %]
59
                <a href="#">[% search_result_str | html %]</a>
30
                    <a href="#">Results of search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]</a>
31
                [% ELSE %]
32
                    <a href="#">You did not specify any search criteria</a>
33
                [% END %]
34
            </li>
60
            </li>
35
        </ul>
61
        </ul>
36
62
37
- 

Return to bug 15434