From f5a89e743fac121380915c818d265fcc35131746 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 18 Mar 2022 16:06:53 +0000 Subject: [PATCH] Bug 30317: Replace the use of jQueryUI tabs on search history page This patch replaces jQueryUI tabs on the staff interface's search history page, replacing them with Bootstrap tabs. To test, apply the patch and perform some bibliographic and authority searches in the staff client if necessary. Go to the search history page and test that the "Catalog" and "Authority" tabs work correctly. Signed-off-by: Jonathan Druart Signed-off-by: Fridolin Somers --- .../en/modules/catalogue/search-history.tt | 336 +++++++++--------- 1 file changed, 168 insertions(+), 168 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index 30eea94edf..0ef57c025b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -34,179 +34,181 @@

Search history

-
- -
- [% IF ( current_biblio_searches ) %] -

Current session

-
-

- Select all visible rows - | - Clear selection on visible rows - | - - Select searches to: - Delete - -

- - - - - - - - - - - - [% FOREACH s IN current_biblio_searches %] - - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
-
- [% END %] +
+ +
+
+ [% IF ( current_biblio_searches ) %] +

Current session

+
+

+ Select all visible rows + | + Clear selection on visible rows + | + + Select searches to: + Delete + +

+ + + + + + + + + + + + [% FOREACH s IN current_biblio_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
+
+ [% END %] - [% IF ( current_biblio_searches && previous_biblio_searches) %] -
- [% END %] + [% IF ( current_biblio_searches && previous_biblio_searches) %] +
+ [% END %] - [% IF ( previous_biblio_searches ) %] -

Previous sessions

-
-

- Select all visible rows - | - Clear selection on visible rows - | - - Select searches to: - Delete - -

- - - - - - - - - - - - [% FOREACH s IN previous_biblio_searches %] - - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
-
- [% END %] + [% IF ( previous_biblio_searches ) %] +

Previous sessions

+
+

+ Select all visible rows + | + Clear selection on visible rows + | + + Select searches to: + Delete + +

+ + + + + + + + + + + + [% FOREACH s IN previous_biblio_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
+
+ [% END %] - [% IF !current_biblio_searches && !previous_biblio_searches %] -

Your catalog search history is empty.

- [% END %] -
+ [% IF !current_biblio_searches && !previous_biblio_searches %] +

Your catalog search history is empty.

+ [% END %] +
-
- [% IF ( current_authority_searches ) %] -

Current session

-
-

- Select all visible rows - | - Clear selection on visible rows - | - - Select searches to: - Delete - -

- - - - - - - - - - - - [% FOREACH s IN current_authority_searches %] - - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
-
- [% END %] +
+ [% IF ( current_authority_searches ) %] +

Current session

+
+

+ Select all visible rows + | + Clear selection on visible rows + | + + Select searches to: + Delete + +

+ + + + + + + + + + + + [% FOREACH s IN current_authority_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
+
+ [% END %] - [% IF ( current_authority_searches && previous_authority_searches) %] -
- [% END %] + [% IF ( current_authority_searches && previous_authority_searches) %] +
+ [% END %] - [% IF ( previous_authority_searches ) %] -

Previous sessions

-
-

- Select all visible rows - | - Clear selection on visible rows - | - - Select searches to: - Delete - -

- - - - - - - - - - - - [% FOREACH s IN previous_authority_searches %] - - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
-
- [% END %] + [% IF ( previous_authority_searches ) %] +

Previous sessions

+
+

+ Select all visible rows + | + Clear selection on visible rows + | + + Select searches to: + Delete + +

+ + + + + + + + + + + + [% FOREACH s IN previous_authority_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc | html %][% s.total | html %]
+
+ [% END %] - [% IF !current_authority_searches && !previous_authority_searches %] -

Your authority search history is empty.

- [% END %] -
[% # /authority_tab %] -
[% # /tabs %] + [% IF !current_authority_searches && !previous_authority_searches %] +

Your authority search history is empty.

+ [% END %] +
[% # /authority_tab %] +
+
[% # /tabs %]
[% # /div.col-md-8 %] [% # /div.row %] @@ -224,8 +226,6 @@ "sPaginationType": "full_numbers" })); - $('#tabs').tabs(); - // DataTables removes hidden rows from the DOM, so we can't expect a // "regular" submit to work and we need to build another form containing // all form elements, and then submit this form. -- 2.20.1