From d37e4d0bbaa9292577e413f1cb4166222411123c Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 4 Dec 2014 17:22:46 -0500
Subject: [PATCH] LP#1402797 Repair browser client dropdown buttons

Angular-ui-bootstrap as of version ~0.11.2 does not want bare
"dropdown-toggle" attributes within action link tags.  When present,
they prevent the dropdown button from opening.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../templates/staff/cat/catalog/t_catalog.tt2    | 10 +++++-----
 .../templates/staff/circ/checkin/t_checkin.tt2   | 16 ++++++++--------
 .../templates/staff/circ/in_house_use/index.tt2  |  4 ++--
 .../templates/staff/circ/patron/t_checkout.tt2   |  4 ++--
 .../src/templates/staff/share/t_autogrid.tt2     |  5 ++---
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index 47f1c6f183..0549d7db9e 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -16,16 +16,16 @@
         <span class="caret"></span>
       </button>
       <ul class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><a href dropdown-toggle ng-click="set_record_tab('catalog')">
+        <li><a href ng-click="set_record_tab('catalog')">
             [% l('OPAC View') %]</a></li>
-        <li><a href dropdown-toggle ng-click="set_record_tab('marc_html')">
+        <li><a href ng-click="set_record_tab('marc_html')">
             [% l('MARC View') %]</a></li>
         <li class="divider"></li>
-        <li><a href dropdown-toggle ng-click="set_record_tab('holds')">
+        <li><a href ng-click="set_record_tab('holds')">
             [% l('View Holds') %]</a></li>
-        <li><a href dropdown-toggle ng-click="mark_hold_transfer_dest()">
+        <li><a href ng-click="mark_hold_transfer_dest()">
             [% l('Mark as Title Hold Transfer Destination') %]</a></li>
-        <li><a href dropdown-toggle ng-click="transfer_holds_to_marked()">
+        <li><a href ng-click="transfer_holds_to_marked()">
             [% l('Transfer All Title Holds') %]</a></li>
       </ul>
     </div>
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
index 83b88f50b4..1d8c46622e 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
@@ -139,7 +139,7 @@
       </button>
       <ul class="dropdown-menu pull-right">
         <li>
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('no_precat_alert')">
             <span ng-if="modifiers.no_precat_alert" 
               class="label label-success">&#x2713;</span>
@@ -149,7 +149,7 @@
           </a>
         </li>
         <li ng-if="!is_capture"><!-- nonsensical for hold capture -->
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('noop')">
             <span ng-if="modifiers.noop" 
               class="label label-success">&#x2713;</span>
@@ -159,7 +159,7 @@
           </a>
         </li>
         <li>
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('void_overdues')">
             <span ng-if="modifiers.void_overdues" 
               class="label label-success">&#x2713;</span>
@@ -169,7 +169,7 @@
           </a>
         </li>
         <li>
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('auto_print_holds_transits')">
             <span ng-if="modifiers.auto_print_holds_transits" 
               class="label label-success">&#x2713;</span>
@@ -179,7 +179,7 @@
           </a>
         </li>
         <li>
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('clear_expired')">
             <span ng-if="modifiers.clear_expired" 
               class="label label-success">&#x2713;</span>
@@ -189,7 +189,7 @@
           </a>
         </li>
         <li>
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('retarget_holds')">
             <span ng-if="modifiers.retarget_holds" 
               class="label label-success">&#x2713;</span>
@@ -199,7 +199,7 @@
           </a>
         </li>
         <li>
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('retarget_holds_all')">
             <span ng-if="modifiers.retarget_holds_all" 
               class="label label-success">&#x2713;</span>
@@ -209,7 +209,7 @@
           </a>
         </li>
         <li>
-          <a href dropdown-toggle 
+          <a href
             ng-click="toggle_mod('hold_as_transit')">
             <span ng-if="modifiers.hold_as_transit" 
               class="label label-success">&#x2713;</span>
diff --git a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
index 2299603dac..7946ce5ba0 100644
--- a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
@@ -39,12 +39,12 @@
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu">
-            <li><a href dropdown-toggle
+            <li><a href
               ng-click="args.noncat_type='barcode';bcFocus=true">
               [% l('Barcode') %]</a>
             </li>
             <li class="divider"></li>
-            <li><a href dropdown-toggle
+            <li><a href
               ng-repeat='type in nonCatTypes'
               ng-click="args.noncat_type=type.id()">{{type.name()}}</a>
             </li>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index 945f2dba4a..f42bfe9673 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -12,13 +12,13 @@
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu">
-            <li><a href dropdown-toggle
+            <li><a href
               ng-click="checkoutArgs.noncat_type='barcode';focusMe=true">
               [% l('Barcode') %]</a>
             </li>
             <li class="divider"></li>
             <li>
-              <a href ng-repeat='type in nonCatTypes' dropdown-toggle
+              <a href ng-repeat='type in nonCatTypes'
                ng-click="checkoutArgs.noncat_type=type.id()">{{type.name()}}</a>
             </li>
           </ul>
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 36cb85fb2b..912b64493d 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -66,13 +66,12 @@
 
     <!-- actions drop-down menu -->
     <div class="btn-group" ng-if="actions.length" dropdown>                                                  
-      <button type="button" class="btn btn-default dropdown-toggle"
-        ng-class="{disabled : false}">
+      <button type="button" class="btn btn-default dropdown-toggle">
         [% l('Actions') %] <span class="caret"></span>                       
       </button>                                                              
       <ul class="dropdown-menu pull-right">                                  
         <li ng-repeat="action in actions" ng-class="{divider: action.divider}">
-          <a ng-if="!action.divider" href dropdown-toggle
+          <a ng-if="!action.divider" href
             ng-click="actionLauncher(action)">{{action.label}}</a>
         </li>
       </ul>
-- 
2.43.2