Attachment #110409 for bug #24155

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




<!-- BOOLEAN SEARCH OPTIONS -->
    <fieldset id="searchterms">
    <legend>Search for </legend>
    [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
        [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
            <input type="checkbox" name="whole_record">
            <label for="whole_record">Search entire MARC record</label>
        [% END %]
        <span id="weight_search">
            <input type="checkbox" name="weight_search" checked>
            <label for="weight_search">Apply field weightings to search</label>
        </span>
    [% END %]
    [% FOREACH search_box IN search_boxes_loop %]
        [% IF ( search_boxes_label ) %]<div style="text-indent: 4.5em;">[% ELSE %]<div>[% END %]
			[% IF ( expanded_options ) %]

            [% END %]
		</div>
    [% END %]
    [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
        [% IF ( expanded_options ) %]
            <p>
                [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
                    <label><input type="checkbox" name="whole_record" /> Search entire MARC record</label>
                [% END %]
                <span id="weight_search">
                    <label><input type="checkbox" name="weight_search" checked="checked" /> Apply field weights to search</label>
                </span>
            <p>
        [% ELSE %]
            <input type="hidden" name="weight_search" value="1" />
        [% END %]
    [% END %]
    </fieldset>
<!-- /BOOLEAN SEARCH OPTIONS -->





                    <div id="booleansearch" class="maincontent">
                        <fieldset>
                            <legend>Search for:</legend>
                            [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
                                <span id="weight_search">
                                    <input type="checkbox" name="weight_search" checked>
                                    <label for="weight_search">Apply field weightings to search</label>
                                </span>
                            [% END %]
                            [% IF ( expanded_options ) %]
                                <div class="advanced-search-terms extended">
                            [% ELSE %]

                                        [% END %]
                                    </div> <!-- /.search-term-row -->
                                [% END # FOREACH search_box %]
                                [% IF ( expanded_options ) %]
                                    [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
                                        <div id="weight_search">
                                            <label>
                                                <input type="checkbox" name="weight_search" checked="checked">
                                                Apply field weights to search
                                            </label>
                                        </div>
                                    [% END %]
                                [% ELSE %]
                                    <input type="hidden" name="weight_search" value="1" />
                                [% END %]
                            </div> <!-- /.search-terms -->
                        </fieldset>
                    </div> <!-- /#booleansearch -->
- 

Return to bug 24155

Lines 93-108 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-10 / +14 lines)
93	<!-- BOOLEAN SEARCH OPTIONS -->	93	<!-- BOOLEAN SEARCH OPTIONS -->
94	<fieldset id="searchterms">	94	<fieldset id="searchterms">
95	<legend>Search for </legend>	95	<legend>Search for </legend>
96	[% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
97	[% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
98	<input type="checkbox" name="whole_record">
99	<label for="whole_record">Search entire MARC record</label>
100	[% END %]
101	<span id="weight_search">
102	<input type="checkbox" name="weight_search" checked>
103	<label for="weight_search">Apply field weightings to search</label>
104	</span>
105	[% END %]
106	[% FOREACH search_box IN search_boxes_loop %]	96	[% FOREACH search_box IN search_boxes_loop %]
107	[% IF ( search_boxes_label ) %]<div style="text-indent: 4.5em;">[% ELSE %]<div>[% END %]	97	[% IF ( search_boxes_label ) %]<div style="text-indent: 4.5em;">[% ELSE %]<div>[% END %]
108	[% IF ( expanded_options ) %]	98	[% IF ( expanded_options ) %]
Lines 126-131 Link Here
126	[% END %]	116	[% END %]
127	</div>	117	</div>
128	[% END %]	118	[% END %]
		119	[% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
		120	[% IF ( expanded_options ) %]
		121	<p>
		122	[% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
		123	<label><input type="checkbox" name="whole_record" /> Search entire MARC record</label>
		124	[% END %]
		125	<span id="weight_search">
		126	<label><input type="checkbox" name="weight_search" checked="checked" /> Apply field weights to search</label>
		127	</span>
		128	<p>
		129	[% ELSE %]
		130	<input type="hidden" name="weight_search" value="1" />
		131	[% END %]
		132	[% END %]
129	</fieldset>	133	</fieldset>
130	<!-- /BOOLEAN SEARCH OPTIONS -->	134	<!-- /BOOLEAN SEARCH OPTIONS -->
131		135

Lines 30-41 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt (-7 / +12 lines)
30	<div id="booleansearch" class="maincontent">	30	<div id="booleansearch" class="maincontent">
31	<fieldset>	31	<fieldset>
32	<legend>Search for:</legend>	32	<legend>Search for:</legend>
33	[% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
34	<span id="weight_search">
35	<input type="checkbox" name="weight_search" checked>
36	<label for="weight_search">Apply field weightings to search</label>
37	</span>
38	[% END %]
39	[% IF ( expanded_options ) %]	33	[% IF ( expanded_options ) %]
40	<div class="advanced-search-terms extended">	34	<div class="advanced-search-terms extended">
41	[% ELSE %]	35	[% ELSE %]
Lines 135-140 Link Here
135	[% END %]	129	[% END %]
136	</div> <!-- /.search-term-row -->	130	</div> <!-- /.search-term-row -->
137	[% END # FOREACH search_box %]	131	[% END # FOREACH search_box %]
		132	[% IF ( expanded_options ) %]
		133	[% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
		134	<div id="weight_search">
		135	<label>
		136	<input type="checkbox" name="weight_search" checked="checked">
		137	Apply field weights to search
		138	</label>
		139	</div>
		140	[% END %]
		141	[% ELSE %]
		142	<input type="hidden" name="weight_search" value="1" />
		143	[% END %]
138	</div> <!-- /.search-terms -->	144	</div> <!-- /.search-terms -->
139	</fieldset>	145	</fieldset>
140	</div> <!-- /#booleansearch -->	146	</div> <!-- /#booleansearch -->
141	-