Attachment 27351 Details for Bug 12094 – [SIGNED OFF] Bug 12094 - jQueryUI upgrade broke default tab selection

[patch] [SIGNED OFF] Bug 12094 - jQueryUI upgrade broke default tab selection

SIGNED-OFF-Bug-12094---jQueryUI-upgrade-broke-defa.patch (text/plain), 10.26 KB, created by Mark Tompsett on 2014-04-21 15:50:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2014-04-21 15:50:15 UTC

Size: 10.26 KB

patch

obsolete

>From d03232b2d5f2121374f695437629112c9b0429da Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 16 Apr 2014 10:21:05 -0400
>Subject: [PATCH] [SIGNED OFF] Bug 12094 - jQueryUI upgrade broke default tab
> selection
>
>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 <mtompset@hotmail.com>
>
>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.
>---
> .../intranet-tmpl/prog/en/includes/cat-search.inc  |    2 +-
> .../prog/en/modules/acqui/basketgroup.tt           |    4 ++--
> .../prog/en/modules/admin/authorised_values.tt     |    4 ++--
> .../prog/en/modules/admin/itemtypes.tt             |    6 +++---
> .../prog/en/modules/cataloguing/addbiblio.tt       |    4 ++--
> .../prog/en/modules/suggestion/suggestion.tt       |    5 -----
> .../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 186f1d1..84cc333 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 @@
> 			<ul>
>             [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
>     [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-selected"><a href="#catalog_search">Search the catalog</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>	
> </div>
> </div>
>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 0b205c9..8f5e1a2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -306,9 +306,9 @@ function submitForm(form) {
>                     <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
>                     <div id="basket_groups" class="toptabs">
>                         <ul class="ui-tabs-nav">
>-                            [% UNLESS ( listclosed) %]<li class="ui-tabs-selected"><a href="#opened">Open</a></li>
>+                            [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>
>                             [% ELSE%]<li><a href="#opened">Open</a></li>[% END %]
>-                            [% IF ( listclosed) %]<li class="ui-tabs-selected"><a href="#closed">Closed</a></li>
>+                            [% IF ( listclosed) %]<li class="ui-tabs-active"><a href="#closed">Closed</a></li>
>                             [% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]
>                         </ul>
>                         <div id="opened">
>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 7cfc91d..9e96c34 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() {
> 
> <style type="text/css">
> 	fieldset.rows div.toptabs li { clear:none;margin-right:.5em;padding-bottom:0;width:auto; }
>-    fieldset.rows div.toptabs .ui-tabs-nav li.ui-tabs-selected {background-color : #F4F8F9; }
>+    fieldset.rows div.toptabs .ui-tabs-nav li.ui-tabs-active {background-color : #F4F8F9; }
> 	fieldset.rows .ui-tabs-panel { margin-right : 10px; margin-left : 10px;margin-bottom:10px;}
>     fieldset.rows .ui-tabs-nav { margin-left : 10px; }
> </style>
>@@ -119,7 +119,7 @@ $(document).ready(function() {
> 			<ul>
>                   <li><a href="#none">None</a></li>
> 				  [% FOREACH imageset IN imagesets %]
>-                        [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
>+                        [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
> 				  [% END %]
> 			</ul>
>   <div id="none"><ul>
>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 745dc6b..a07ae46 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
> </script>
> <style type="text/css">
> 	fieldset.rows div.toptabs li { clear:none;margin-right:.5em;padding-bottom:0;width:auto; }
>-  fieldset.rows div.toptabs .ui-tabs-nav li.ui-tabs-selected {background-color : #F4F8F9; }
>+  fieldset.rows div.toptabs .ui-tabs-nav li.ui-tabs-active {background-color : #F4F8F9; }
> 	fieldset.rows .ui-tabs-panel { margin-right : 10px; margin-left : 10px;margin-bottom:10px;}
>   fieldset.rows .ui-tabs-nav { margin-left : 10px; }
> </style>
>@@ -115,9 +115,9 @@ Item types administration
> 			<ul>
>           <li><a href="#none">None</a></li>
> 				  [% FOREACH imageset IN imagesets %]
>-            [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
>+            [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
> 				  [% END %]
>-                  [% IF ( remote_image ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>
>+                  [% IF ( remote_image ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>
> 			</ul>
>   <div id="none"><ul>
>   <li><label for="noimage">No image: </label><input type="radio" name="image" id="noimage" value="removeImage" /></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 286e8b7..8cd1945 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -23,7 +23,7 @@
> 		});
> 
>         [% IF tab %]
>-          $('#addbibliotabs').tabs('option', 'selected', "#[% tab %]");
>+          $('#addbibliotabs').selectTabByID("#[% tab %]");
>         [% END %]
> 
> 		/* check cookie to hide/show marcdocs*/
>@@ -94,7 +94,7 @@
>         });
>         $("#saveandcontinue").click(function(){
>             $(".btn-group").removeClass("open");
>-            var tab = $("#addbibliotabs li.ui-tabs-selected:first a").attr('href');
>+            var tab = $("#addbibliotabs li.ui-tabs-active:first a").attr('href');
>             tab = tab.replace('#', '');
>             $("#current_tab").val(tab);
>             redirect("just_save", tab);
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>index 15c56c1..2f79255 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -437,12 +437,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
>     <div id="suggestiontabs" class="toptabs">
>     <ul class="ui-tabs-nav">
>         [% FOREACH suggestion IN suggestions %]
>-            [% IF ( suggestion.first ) %]
>-                <li class="ui-tabs-selected">
>-            [% ELSE %]
>                 <li>
>-            [% END %]
>-
>             <a href="#[% suggestion.suggestiontype %]">
>             [% IF ( suggestion.suggestiontypelabel ) %]
>                 [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>index 1790508..afcb95c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>@@ -75,7 +75,7 @@ function reloadPage(p) {
>     <li><a href="#csvnew">New profile</a></li>
> 	[% IF ( existing_profiles ) %]
> 	[% IF ( selected_profile_id ) %]
>-	<li class="ui-tabs-selected">
>+    <li class="ui-tabs-active">
> 	[% ELSE %]
> 	<li>
> 	 [% END %]
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 12094: 27217 | 27351 | 27390