@@ -, +, @@ search --- .../bootstrap/en/includes/html_helpers.inc | 65 +++++++++++++++++++ .../bootstrap/en/modules/opac-advsearch.tt | 40 ++++++------ 2 files changed, 84 insertions(+), 21 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc @@ -33,3 +33,68 @@ [%- END -%] [%- this_biblio_href | url %][% biblionumber | url -%] [%- END %] + +[% # BOOTSTRAP TAB WRAPPER USAGE %] +[% # [ WRAPPER tabs id= "tabs_container_id" ] %] +[% # [ WRAPPER tabs_nav ] %] +[% # [ WRAPPER tab_item tabname= "tab_name_1" bt_active= 1 ] Tab text 1 [ END ] %] +[% # [ WRAPPER tab_item tabname= "tab_name_2" ] Tab text 2 [ END ] %] +[% # ... %] +[% # [ END ] %] +[% # [ WRAPPER tab_panels ] %] +[% # [ WRAPPER tab_panel tabname="tab_name_1" bt_active= 1 ] Panel contents 1 [ END ] %] +[% # [ WRAPPER tab_panel tabname="tab_name_2" ] Panel contents 2 [ END ] %] +[% # ... %] +[% # [ END ] %] +[% # [ END ] %] + +[% BLOCK tabs %] + [% IF ( id ) %] +
+ [% ELSE %] +
+ [% END %] + [% content | $raw %] +
+[% END %] + +[% BLOCK tabs_nav %] + +[% END %] + +[% BLOCK tab_item %] + +[% END %] + +[% BLOCK tab_panels %] + [% IF ( id ) %] +
+ [% ELSE %] +
+ [% END %] + [% content | $raw %] +
+[% END %] + +[% BLOCK tab_panel %] + [% IF ( bt_active ) %] +
+ [% ELSE %] +
+ [% END %] + [% content| $raw %] +
+[% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -112,7 +112,7 @@
- +
[% IF ( expanded_options ) %]
@@ -144,7 +144,7 @@ See from (non-preferred form) headings are included
[% END %] -
+
@@ -162,23 +162,21 @@ [%# Following on one line for translatability %] [% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %]
-
- -
+ [% END # /WRAPPER tabs_nav %] + [% WRAPPER tab_panels id= "advsearches" %] [% FOREACH advsearchloo IN advancedsearchesloop %] -
+ [% WRAPPER tab_panel tabname="advsearch-tab-${advsearchloo.advanced_search_type}" %]
Limit to any of the following:
@@ -204,13 +202,13 @@ [% END %] [% END %]
-
+ [% END # /tab_panel#advsearch-advsearchloo.advanced_search_type %] [% END # / FOREACH advancedsearchesloop %] -
-
+ [% END # /tab_panels %] + [% END # /WRAPPER tabs#advsearches %]
[% END # /IF OpacAdvSearchOptions %] - +
@@ -483,7 +481,7 @@ $(document).ready(function() { [% END %] if( $("#advsearches .tab-pane.active").length < 1 ){ - $("#advsearches a:first").tab("show"); + $("#advsearches li:first a").tab("show"); } $('.search-term-row .search-term-input select[name="op"]').first().prop("disabled",true).hide(); --