From 5d1519ad18a56f8ade3e4e92ebf6119c9543485a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 20 Feb 2014 11:38:53 -0500
Subject: [PATCH] Bug 11794 - restore functioning of opacSerialDefaultTab

The opacSerialDefaultTab system preference should control whether to
show the holdings or subscriptions tab by default on the detail page for
a serial. This behavior was broken when we last updated jQueryUI because
of a change in the jQueryUI active tab class name.

This patch corrects the class on the detail page and removes the old
class from the authorities detail page (where it was unnecessary
anyway).

To test, view a serial record in the OPAC under various settings of the
opacSerialDefaultTab preference. The default tab should correctly follow
the preference.

Test in prog and Bootstrap themes.

Edit: Rebased on current master. Note that the change to
opac-auth-detail.tt is because the page never has more than one tab,
hence doesn't need the "active" designation.

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested in prog and bootstrap.
All tests and QA script pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 15ad3061b2fb11df6ecf5601d5b7d49d7792ba9f)

Conflicts:
	koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
---
 .../opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt      | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt     | 6 +++---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt     | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
index 3c5b05f0d3..18a942efcf 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
@@ -108,7 +108,7 @@
 
                         <div id="authdescriptions" class="toptabs">
                             <ul>
-                                <li id="tab_descriptions" class="ui-tabs-selected"><a href="#descriptions">Notes</a></li>
+                                <li id="tab_descriptions"><a href="#descriptions">Notes</a></li>
                             </ul>
                             <div id="descriptions">
                                 <div class="content_set">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 867cb741ea..2ad5bfd2e5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -513,7 +513,7 @@
 
                     <ul>
                         [% IF ( defaulttab == 'holdings' ) %]
-                            <li id="tab_holdings" class="ui-tabs-selected">
+                            <li id="tab_holdings" class="ui-tabs-active">
                         [% ELSE %]
                             <li id="tab_holdings">
                         [% END %]
@@ -555,7 +555,7 @@
                         [% END %]
 
                         [% IF ( subscriptionsnumber ) %]
-                            [% IF ( defaulttab == 'subscriptions' ) %]<li id="tab_subscriptions" class="ui-tabs-selected">[% ELSE %]<li id="tab_subscriptions">[% END %]
+                            [% IF ( defaulttab == 'subscriptions' ) %]<li id="tab_subscriptions" class="ui-tabs-active">[% ELSE %]<li id="tab_subscriptions">[% END %]
                                 <a href="#subscriptions">Subscriptions</a>
                             </li>
                         [% END %]
@@ -575,7 +575,7 @@
                         [% END %]
 
                         [% IF ( serialcollection ) %]
-                            [% IF ( defaulttab == 'serialcollection' ) %]<li id="tab_serialcollection" class="ui-tabs-selected">[% ELSE %]<li id="tab_serialcollection">[% END %]
+                            [% IF ( defaulttab == 'serialcollection' ) %]<li id="tab_serialcollection" class="ui-tabs-active">[% ELSE %]<li id="tab_serialcollection">[% END %]
                                 <a href="#serialcollection">Serial collection</a>
                             </li>
                         [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
index 78bc5b988e..1a46f84997 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
@@ -92,7 +92,7 @@ $(document).ready(function() {
 [% END %]
 <div id="authdescriptions" class="toptabs">
 <ul>
-    <li id="tab_descriptions" class="ui-tabs-selected"><a href="#descriptions">Notes</a></li>
+    <li id="tab_descriptions"><a href="#descriptions">Notes</a></li>
 </ul>
 <div id="descriptions">
 <div class="content_set">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 05c4010474..c917f27a57 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -937,7 +937,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <div id="bibliodescriptions" class="toptabs">
 
 <ul>   
-    [% IF ( defaulttab == 'holdings' ) %]<li id="tab_holdings" class="ui-tabs-selected">[% ELSE %]<li id="tab_holdings">[% END %]
+    [% IF ( defaulttab == 'holdings' ) %]<li id="tab_holdings" class="ui-tabs-active">[% ELSE %]<li id="tab_holdings">[% END %]
         <a href="#holdings">[% IF SeparateHoldings %][% LoginBranchname %] holdings[% ELSE %]Holdings[% END %] ( [% itemloop.size || 0 %] )</a>
     </li>
     [% IF (SeparateHoldings) %]
@@ -976,7 +976,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% END %]
 [% END %]
 [% IF ( subscriptionsnumber ) %]
-    [% IF ( defaulttab == 'subscriptions' ) %]<li id="tab_subscriptions" class="ui-tabs-selected">[% ELSE %]<li id="tab_subscriptions">[% END %]
+    [% IF ( defaulttab == 'subscriptions' ) %]<li id="tab_subscriptions" class="ui-tabs-active">[% ELSE %]<li id="tab_subscriptions">[% END %]
         <a href="#subscriptions">Subscriptions</a>
     </li>
 [% END %]
@@ -995,7 +995,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% END %][% END %]
 
 [% IF ( serialcollection ) %]
-    [% IF ( defaulttab == 'serialcollection' ) %]<li id="tab_serialcollection" class="ui-tabs-selected">[% ELSE %]<li id="tab_serialcollection">[% END %]
+    [% IF ( defaulttab == 'serialcollection' ) %]<li id="tab_serialcollection" class="ui-tabs-active">[% ELSE %]<li id="tab_serialcollection">[% END %]
         <a href="#serialcollection">Serial collection</a>
     </li>
 [% END %]
-- 
2.39.5