Attachment #133716 for bug #30424

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




                            <div class="btn-group">
                                <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>
                            </div>
                        </fieldset> <!-- /.action -->
                    </div> <!-- /#toolbar -->
                    <!-- /SEARCH BUTTONS -->

                    [% IF ( outer_servers_loop ) %]

                                <label for="[% local_servers_loo.id | html %]">
                                    <img width="16" height="16" alt="[% local_servers_loo.id | html %]" src="[% themelang | html %]/img/[% local_servers_loo.icon | html %]" /> [% local_servers_loo.label | html %]
                                </label>
                            [% END # /FOREACH local_servers_loo %]
                        </fieldset>
                        <!-- /DATABASES -->
                    [% END # /IF ( outer_servers_loop ) %]

                    [% IF ( outer_servers_loop ) %]
                        <!-- REMOTE DATABASES -->

                                <label for="[% outer_servers_loo.id | html %]">
                                    <img alt="[% outer_servers_loo.id | html %]" src="[% themelang | html %]/images/[% outer_servers_loo.icon | html %]" />[% outer_servers_loo.label | html %]
                                </label>
                            [% END # /FOREACH outer_servers_loo %]
                        </fieldset> <!-- /#databases -->
                        <!-- /REMOTE DATABASES -->
                    [% END %]


                                                <option value="NOT">not</option>
                                            [% END %]
                                        </select>
                                [% END # /IF loop.first %]
                            [% ELSE %]
                                <div>
                            [% END # /IF ( expanded_options ) %]

                            [% SET preselect = 'ms_' _ indexes.${loop.index}.replace(',','comma') %]
                            [% INCLUDE 'search_indexes.inc' %]

                                [% IF ( loop.first ) %]
                                    <label for="scan">Scan indexes:</label> <input type="checkbox" name="scan" id="scan" value="1" />
                                [% END %]
                            [% END # /IF ( expanded_options ) %]
                            </div> <!-- /.search-term-row -->
                        [% END # /FOREACH query IN queries %]

                        [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
                            [% IF ( expanded_options ) %]

                                <p>
                            [% ELSE %]
                                <input type="hidden" name="weight_search" value="1" />
                            [% END # /IF ( expanded_options ) %]
                        [% END #/IF Koha.Preference('SearchEngine') %]
                    </fieldset> <!-- /#searchterms -->
                    <!-- /BOOLEAN SEARCH OPTIONS -->
                </div> <!-- /#advanced-search -->

                <!-- MC-TYPE LIMITS -->
                <div id="advsearches" class="toptabs">

                                    [% END %]
                                </a>
                            </li>
                        [% END # /FOREACH advsearchloo %]
                    </ul>

                    [% FOREACH advsearchloo IN advancedsearchesloop %]

                                                <input type="checkbox" checked="checked" id="[% itemtypeloo.ccl FILTER remove(',') | html %]-[% itemtypeloo.number | html %]" name="limit" value="mc-[% itemtypeloo.ccl | html %]:[% itemtypeloo.code | html %]"/>
                                            [% ELSE %]
                                                <input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') | html %]-[% itemtypeloo.number | html %]" name="limit" value="mc-[% itemtypeloo.ccl | html %]:[% itemtypeloo.code | html %]"/>
                                            [% END # /IF limits.$limit_key.defined %]
                                            <label for="[% itemtypeloo.ccl FILTER remove(',') | html %]-[% itemtypeloo.number | html %]">
                                                [% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %]
                                                    [% IF ( itemtypeloo.imageurl ) %]

                                                </tr>
                                                <tr>
                                            [% END %]
                                        [% END # /IF ( loop.last ) %]
                                    [% END # /FOREACH itemtypeloo %]
                            </table>
                        </div> <!-- /#advsearch-[% advsearchloo.advanced_search_type | html %] -->
                    [% END # /FOREACH advsearchloo %]
                </div> <!-- /#advsearches -->
                <!-- /MC-TYPE LIMIT -->

                [% IF ( expanded_options ) %]

                                [% END %]
                            </p>
                            <!-- /PUB / COPY YEAR LIMIT -->
                        </fieldset> <!-- /#pubrange -->

                        <fieldset id="language">
                            <!-- LANGUAGE LIMIT -->

                                [% limits.delete( 'language-original,rtrn' ) %]
                            </p>
                            <!-- /LANGUAGE LIMIT -->
                        </fieldset> <!-- /#language -->
                    </fieldset> <!-- /#basiclimits -->
                    <!-- /BASIC LIMITS -->
                [% END # /IF ( expanded_options ) %]

                [% IF ( UNIMARC ) %]
                    [% INCLUDE 'subtypes_unimarc.inc' %]

                                    </span>
                                [% END %]
                                [% limits.delete( subtype ) %]
                            [% END # /FOREACH subtype %]
                        </fieldset> <!-- #current_subtype_limits -->
                    </fieldset> <!-- /#subtype -->
                [% END # /IF ( UNIMARC ) %]

                <!-- AVAILABILITY LIMITS -->
                <fieldset id="availability">

                        [% ELSE %]
                            <p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" /></p>
                        [% END %]
                    </fieldset> <!-- /#currently-avail -->

                    <fieldset id="select-libs">
                        <p>

                                [%# FIXME Should not we filter the libraries displayed? %]
                                [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( unfiltered => 1, do_not_select_my_library => 1, selected => limits.branch.0 ) %]
                                [% limits.delete('branch') %]
                            </select> <!-- /#branchloop -->
                        </p>
                        [% IF search_groups %]
                            <p>OR</p>

                                        [% END %]
                                    [% END %]
                                    [% limits.delete('multibranchlimit') %]
                                </select> <!-- /#categoryloop -->
                            </p>
                        [% END # /search_groups %]
                    </fieldset> <!-- /#select-libs -->
                </fieldset> <!-- /#availability -->
                <!-- /AVAILABILITY LIMITS -->

                <!-- OTHER LIMITS (facets, etc.) -->

                            [% END %]
                        </p>
                    </fieldset>
                [% END # /IF limits.size %]
                <!-- /OTHER LIMITS (facets, etc.) -->

                <!-- RANK LIMITS -->

                            [% INCLUDE 'resort_form.inc' sort_by = sort %]
                        </select>
                    </p>
                </fieldset> <!-- /#sortby -->
                <!-- /RANK LIMITS -->
            </form>
        </div>
- 

Return to bug 30424

Lines 74-81 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-39 / +38 lines)
74	<div class="btn-group">	74	<div class="btn-group">
75	<a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options \| uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>	75	<a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options \| uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>
76	</div>	76	</div>
77	</fieldset>	77	</fieldset> <!-- /.action -->
78	</div>	78	</div> <!-- /#toolbar -->
79	<!-- /SEARCH BUTTONS -->	79	<!-- /SEARCH BUTTONS -->
80		80
81	[% IF ( outer_servers_loop ) %]	81	[% IF ( outer_servers_loop ) %]
Lines 91-100 Link Here
91	<label for="[% local_servers_loo.id \| html %]">	91	<label for="[% local_servers_loo.id \| html %]">
92	<img width="16" height="16" alt="[% local_servers_loo.id \| html %]" src="[% themelang \| html %]/img/[% local_servers_loo.icon \| html %]" /> [% local_servers_loo.label \| html %]	92	<img width="16" height="16" alt="[% local_servers_loo.id \| html %]" src="[% themelang \| html %]/img/[% local_servers_loo.icon \| html %]" /> [% local_servers_loo.label \| html %]
93	</label>	93	</label>
94	[% END %]	94	[% END # /FOREACH local_servers_loo %]
95	</fieldset>	95	</fieldset>
96	<!-- /DATABASES -->	96	<!-- /DATABASES -->
97	[% END %]	97	[% END # /IF ( outer_servers_loop ) %]
98		98
99	[% IF ( outer_servers_loop ) %]	99	[% IF ( outer_servers_loop ) %]
100	<!-- REMOTE DATABASES -->	100	<!-- REMOTE DATABASES -->
Lines 109-116 Link Here
109	<label for="[% outer_servers_loo.id \| html %]">	109	<label for="[% outer_servers_loo.id \| html %]">
110	<img alt="[% outer_servers_loo.id \| html %]" src="[% themelang \| html %]/images/[% outer_servers_loo.icon \| html %]" />[% outer_servers_loo.label \| html %]	110	<img alt="[% outer_servers_loo.id \| html %]" src="[% themelang \| html %]/images/[% outer_servers_loo.icon \| html %]" />[% outer_servers_loo.label \| html %]
111	</label>	111	</label>
112	[% END %]	112	[% END # /FOREACH outer_servers_loo %]
113	</fieldset>	113	</fieldset> <!-- /#databases -->
114	<!-- /REMOTE DATABASES -->	114	<!-- /REMOTE DATABASES -->
115	[% END %]	115	[% END %]
116		116
Lines 139-148 Link Here
139	<option value="NOT">not</option>	139	<option value="NOT">not</option>
140	[% END %]	140	[% END %]
141	</select>	141	</select>
142	[% END %]	142	[% END # /IF loop.first %]
143	[% ELSE %]	143	[% ELSE %]
144	<div>	144	<div>
145	[% END %]	145	[% END # /IF ( expanded_options ) %]
146		146
147	[% SET preselect = 'ms_' _ indexes.${loop.index}.replace(',','comma') %]	147	[% SET preselect = 'ms_' _ indexes.${loop.index}.replace(',','comma') %]
148	[% INCLUDE 'search_indexes.inc' %]	148	[% INCLUDE 'search_indexes.inc' %]
Lines 154-162 Link Here
154	[% IF ( loop.first ) %]	154	[% IF ( loop.first ) %]
155	<label for="scan">Scan indexes:</label> <input type="checkbox" name="scan" id="scan" value="1" />	155	<label for="scan">Scan indexes:</label> <input type="checkbox" name="scan" id="scan" value="1" />
156	[% END %]	156	[% END %]
157	[% END %]	157	[% END # /IF ( expanded_options ) %]
158	</div>	158	</div> <!-- /.search-term-row -->
159	[% END %]	159	[% END # /FOREACH query IN queries %]
160		160
161	[% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]	161	[% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
162	[% IF ( expanded_options ) %]	162	[% IF ( expanded_options ) %]
Lines 170-180 Link Here
170	<p>	170	<p>
171	[% ELSE %]	171	[% ELSE %]
172	<input type="hidden" name="weight_search" value="1" />	172	<input type="hidden" name="weight_search" value="1" />
173	[% END %]	173	[% END # /IF ( expanded_options ) %]
174	[% END %]	174	[% END #/IF Koha.Preference('SearchEngine') %]
175	</fieldset>	175	</fieldset> <!-- /#searchterms -->
176	<!-- /BOOLEAN SEARCH OPTIONS -->	176	<!-- /BOOLEAN SEARCH OPTIONS -->
177	</div>	177	</div> <!-- /#advanced-search -->
178		178
179	<!-- MC-TYPE LIMITS -->	179	<!-- MC-TYPE LIMITS -->
180	<div id="advsearches" class="toptabs">	180	<div id="advsearches" class="toptabs">
Lines 189-195 Link Here
189	[% END %]	189	[% END %]
190	</a>	190	</a>
191	</li>	191	</li>
192	[% END %]	192	[% END # /FOREACH advsearchloo %]
193	</ul>	193	</ul>
194		194
195	[% FOREACH advsearchloo IN advancedsearchesloop %]	195	[% FOREACH advsearchloo IN advancedsearchesloop %]
Lines 205-211 Link Here
205	<input type="checkbox" checked="checked" id="[% itemtypeloo.ccl FILTER remove(',') \| html %]-[% itemtypeloo.number \| html %]" name="limit" value="mc-[% itemtypeloo.ccl \| html %]:[% itemtypeloo.code \| html %]"/>	205	<input type="checkbox" checked="checked" id="[% itemtypeloo.ccl FILTER remove(',') \| html %]-[% itemtypeloo.number \| html %]" name="limit" value="mc-[% itemtypeloo.ccl \| html %]:[% itemtypeloo.code \| html %]"/>
206	[% ELSE %]	206	[% ELSE %]
207	<input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') \| html %]-[% itemtypeloo.number \| html %]" name="limit" value="mc-[% itemtypeloo.ccl \| html %]:[% itemtypeloo.code \| html %]"/>	207	<input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') \| html %]-[% itemtypeloo.number \| html %]" name="limit" value="mc-[% itemtypeloo.ccl \| html %]:[% itemtypeloo.code \| html %]"/>
208	[% END %]	208	[% END # /IF limits.$limit_key.defined %]
209	<label for="[% itemtypeloo.ccl FILTER remove(',') \| html %]-[% itemtypeloo.number \| html %]">	209	<label for="[% itemtypeloo.ccl FILTER remove(',') \| html %]-[% itemtypeloo.number \| html %]">
210	[% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %]	210	[% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %]
211	[% IF ( itemtypeloo.imageurl ) %]	211	[% IF ( itemtypeloo.imageurl ) %]
Lines 223-234 Link Here
223	</tr>	223	</tr>
224	<tr>	224	<tr>
225	[% END %]	225	[% END %]
226	[% END %]	226	[% END # /IF ( loop.last ) %]
227	[% END %]	227	[% END # /FOREACH itemtypeloo %]
228	</table>	228	</table>
229	</div>	229	</div> <!-- /#advsearch-[% advsearchloo.advanced_search_type \| html %] -->
230	[% END %]	230	[% END # /FOREACH advsearchloo %]
231	</div>	231	</div> <!-- /#advsearches -->
232	<!-- /MC-TYPE LIMIT -->	232	<!-- /MC-TYPE LIMIT -->
233		233
234	[% IF ( expanded_options ) %]	234	[% IF ( expanded_options ) %]
Lines 246-252 Link Here
246	[% END %]	246	[% END %]
247	</p>	247	</p>
248	<!-- /PUB / COPY YEAR LIMIT -->	248	<!-- /PUB / COPY YEAR LIMIT -->
249	</fieldset>	249	</fieldset> <!-- /#pubrange -->
250		250
251	<fieldset id="language">	251	<fieldset id="language">
252	<!-- LANGUAGE LIMIT -->	252	<!-- LANGUAGE LIMIT -->
Lines 259-268 Link Here
259	[% limits.delete( 'language-original,rtrn' ) %]	259	[% limits.delete( 'language-original,rtrn' ) %]
260	</p>	260	</p>
261	<!-- /LANGUAGE LIMIT -->	261	<!-- /LANGUAGE LIMIT -->
262	</fieldset>	262	</fieldset> <!-- /#language -->
263	</fieldset>	263	</fieldset> <!-- /#basiclimits -->
264	<!-- /BASIC LIMITS -->	264	<!-- /BASIC LIMITS -->
265	[% END %]	265	[% END # /IF ( expanded_options ) %]
266		266
267	[% IF ( UNIMARC ) %]	267	[% IF ( UNIMARC ) %]
268	[% INCLUDE 'subtypes_unimarc.inc' %]	268	[% INCLUDE 'subtypes_unimarc.inc' %]
Lines 283-292 Link Here
283	</span>	283	</span>
284	[% END %]	284	[% END %]
285	[% limits.delete( subtype ) %]	285	[% limits.delete( subtype ) %]
286	[% END %]	286	[% END # /FOREACH subtype %]
287	</fieldset>	287	</fieldset> <!-- #current_subtype_limits -->
288	</fieldset>	288	</fieldset> <!-- /#subtype -->
289	[% END %]	289	[% END # /IF ( UNIMARC ) %]
290		290
291	<!-- AVAILABILITY LIMITS -->	291	<!-- AVAILABILITY LIMITS -->
292	<fieldset id="availability">	292	<fieldset id="availability">
Lines 297-303 Link Here
297	[% ELSE %]	297	[% ELSE %]
298	<p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" /></p>	298	<p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" /></p>
299	[% END %]	299	[% END %]
300	</fieldset>	300	</fieldset> <!-- /#currently-avail -->
301		301
302	<fieldset id="select-libs">	302	<fieldset id="select-libs">
303	<p>	303	<p>
Lines 307-313 Link Here
307	[%# FIXME Should not we filter the libraries displayed? %]	307	[%# FIXME Should not we filter the libraries displayed? %]
308	[% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( unfiltered => 1, do_not_select_my_library => 1, selected => limits.branch.0 ) %]	308	[% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( unfiltered => 1, do_not_select_my_library => 1, selected => limits.branch.0 ) %]
309	[% limits.delete('branch') %]	309	[% limits.delete('branch') %]
310	</select>	310	</select> <!-- /#branchloop -->
311	</p>	311	</p>
312	[% IF search_groups %]	312	[% IF search_groups %]
313	<p>OR</p>	313	<p>OR</p>
Lines 325-335 Link Here
325	[% END %]	325	[% END %]
326	[% END %]	326	[% END %]
327	[% limits.delete('multibranchlimit') %]	327	[% limits.delete('multibranchlimit') %]
328	</select>	328	</select> <!-- /#categoryloop -->
329	</p>	329	</p>
330	[% END %]	330	[% END # /search_groups %]
331	</fieldset>	331	</fieldset> <!-- /#select-libs -->
332	</fieldset>	332	</fieldset> <!-- /#availability -->
333	<!-- /AVAILABILITY LIMITS -->	333	<!-- /AVAILABILITY LIMITS -->
334		334
335	<!-- OTHER LIMITS (facets, etc.) -->	335	<!-- OTHER LIMITS (facets, etc.) -->
Lines 348-354 Link Here
348	[% END %]	348	[% END %]
349	</p>	349	</p>
350	</fieldset>	350	</fieldset>
351	[% END %]	351	[% END # /IF limits.size %]
352	<!-- /OTHER LIMITS (facets, etc.) -->	352	<!-- /OTHER LIMITS (facets, etc.) -->
353		353
354	<!-- RANK LIMITS -->	354	<!-- RANK LIMITS -->
Lines 360-366 Link Here
360	[% INCLUDE 'resort_form.inc' sort_by = sort %]	360	[% INCLUDE 'resort_form.inc' sort_by = sort %]
361	</select>	361	</select>
362	</p>	362	</p>
363	</fieldset>	363	</fieldset> <!-- /#sortby -->
364	<!-- /RANK LIMITS -->	364	<!-- /RANK LIMITS -->
365	</form>	365	</form>
366	</div>	366	</div>
367	-