From 3a8dc6a421246d8422bf36046e19b70f5b3a5c50 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 16 Apr 2014 10:21:05 -0400 Subject: [PATCH] Bug 12094: fix default tab selection broken by jQueryUI upgrade The recent upgrade to jQueryUI didn't take into account the new method for forcing selection of a tab by adding a class to the tab markup. This patch corrects this by updating the class name. This patch also updates one instance where it was necessary to switch to the new function for selecting a tab by ID, introduced by Bug 12075. To test, view the following pages: - Perform a catalog search in the staff client. On the search results page the "Search the catalog" tab should be selected. - In Acquisitions, view the basket groups page for a vendor which has open and closed basket groups (/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=X). Append "&listclosed=1" to the URL. The "Closed" tab should be selected. - In Administration -> Authorized values, modify an authorized value for which an icon has been selected. When the edit form loads the corresponding icon tab should be selected. - In Administration -> Item types, modify an itemtype for which an icon has been selected. When the edit form loads the corresponding icon tab should be selected. - In Cataloging, open an existing record and select any tab besides the first one. Choose "Save and continue editing" from the Save menu. When the page reloads you should be returned to the tab you selected before. - In Suggestions, markup for selected the tab has been removed because it didn't appear to be performing any function. The first tab is selected by default. The template doesn't need to explicitly add a class to make it so. - In Tools -> CSV profiles, choose an existing profile for editing. When the page loads the "Edit existing profile" tab should be selected. Signed-off-by: Mark Tompsett NOTE: Unable to duplicate Cataloging step issue, but there is no visible regression with the patch. The second part of the addbiblio.tt portion of the patch is clearly correct, because it is the same type of change as made in the other sections. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 8a124f8951c19388f3e3a08ada243f080b6b9373) Signed-off-by: Fridolin Somers Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt --- koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 4 ++-- .../prog/en/modules/admin/authorised_values.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 5 ----- .../intranet-tmpl/prog/en/modules/tools/csv-profiles.tt | 2 +- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc index 186f1d1134..84cc3339d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -26,7 +26,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index f256ec3716..9ab801296c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -241,9 +241,9 @@ function submitForm(form) {
    - [% UNLESS ( closed ) %]
  • Open
    • + [% UNLESS ( closed ) %]
  • Open
    • [% ELSE%]
  • Open
    • [% END %] - [% IF ( closed ) %]
  • Closed
    • + [% IF ( closed ) %]
  • Closed
    • [% ELSE %]
  • Closed
    • [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 7cfc91ddb4..9e96c34ac2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -42,7 +42,7 @@ $(document).ready(function() { @@ -119,7 +119,7 @@ $(document).ready(function() {
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 45d64c88a4..5c6f8cb426 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -43,7 +43,7 @@ Data deleted @@ -115,9 +115,9 @@ Item types administration