From ac326c3148f09fc43652c0489762aeb3413504e4 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Fri, 9 May 2014 17:20:11 -0400
Subject: [PATCH] more drop-down ang-bs repairs

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/src/templates/staff/parts/t_autogrid.tt2 | 18 +++++++--------
 Open-ILS/web/js/ui/default/staff/services/ui.js   | 27 ++++++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
index 6a8107b953..768a314bc6 100644
--- a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
@@ -16,7 +16,7 @@
     </button>
     <ul class="dropdown-menu">
       <li ng-repeat="item in menuItems" ng-class="{divider: item.divider}">
-        <a ng-if="!item.divider" href='' 
+        <a ng-if="!item.divider" href
           ng-click="item.handler(item, item.handlerData)">{{item.label}}</a>
       </li>
     </ul>
@@ -71,7 +71,7 @@
       </button>
       <ul class="dropdown-menu">
         <li ng-repeat="t in [5,10,25,50,100]">
-          <a href='' ng-click='offset(0);limit(t);collect()'>
+          <a href dropdown-toggle ng-click='offset(0);limit(t);collect()'>
             {{t}}
           </a>
         </li>
@@ -100,7 +100,7 @@
         </li>
         <li role="presentation" class="divider"></li>
         <li ng-repeat="t in [1,2,3,4,5,10,25,50,100]">
-          <a href='' ng-click='goToPage(t)'>{{t}}</a>
+          <a href dropdown-toggle ng-click='goToPage(t)'>{{t}}</a>
         </li>
       </ul>
     </div>
@@ -111,19 +111,19 @@
       <span class="caret"></span>
     </button>
     <ul class="dropdown-menu pull-right">
-      <li><a href='' ng-click="toggleConfDisplay()">
+      <li><a href dropdown-toggle ng-click="toggleConfDisplay()">
         <span class="glyphicon glyphicon-wrench"></span>
         [% l('Configure Columns') %]
       </a></li>
-      <li><a href='' ng-click="saveConfig()">
+      <li><a href dropdown-toggle ng-click="saveConfig()">
         <span class="glyphicon glyphicon-floppy-save"></span>
         [% l('Save Columns') %]
       </a></li>
-      <li><a href='' ng-click="showAllColumns()">
+      <li><a href dropdown-toggle ng-click="showAllColumns()">
         <span class="glyphicon glyphicon-resize-full"></span>
         [% l('Show All Columns') %]
       </a></li>
-      <li><a href='' ng-click="hideAllColumns()">
+      <li><a href dropdown-toggle ng-click="hideAllColumns()">
         <span class="glyphicon glyphicon-resize-small"></span>
         [% l('Hide All Columns') %]
       </a></li>
@@ -132,13 +132,13 @@
         <span class="glyphicon glyphicon-download"></span>
         [% l('Download CSV') %]
       </a></li>
-      <li><a href='' ng-click="printCSV()">
+      <li><a href dropdown-toggle ng-click="printCSV()">
         <span class="glyphicon glyphicon-print"></span>
         [% l('Print CSV') %]
       </a></li>
       <li role="presentation" class="divider"></li>
       <li ng-repeat="col in columns">
-        <a href='' ng-click="col.visible = !col.visible">
+        <a href dropdown-toggle ng-click="col.visible = !col.visible">
             <span ng-if="col.visible" 
               class="label label-success">&#x2713;</span>
             <span ng-if="!col.visible" 
diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index 8abb2f3557..f76f1cbf47 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -158,19 +158,20 @@ function($modal, $interpolate) {
 
         // any reason to move this into a TT2 template?
         template : 
-            '<button type="button" class="btn btn-default dropdown-toggle"'
-            + 'data-toggle="dropdown">'
-            + '<span style="padding-right: 5px;">{{getSelectedName()}}</span>'
-            + '<span class="caret"></span>'
-          + '</button>'
-          + '<ul class="dropdown-menu">'
-            + '<li ng-repeat="org in orgList" ng-hide="hiddenTest(org.id)">'
-              + '<a href="" ng-click="orgChanged(org)"'
-                + 'style="padding-left: {{org.depth * 10 + 5}}px">'
-                + '{{org.shortname}}'
-              + '</a>'
-            + '</li>'
-          + '</ul>',
+            '<div class="btn-group" dropdown>'
+            + '<button type="button" class="btn btn-default dropdown-toggle">'
+             + '<span style="padding-right: 5px;">{{getSelectedName()}}</span>'
+             + '<span class="caret"></span>'
+           + '</button>'
+           + '<ul class="dropdown-menu">'
+             + '<li ng-repeat="org in orgList" ng-hide="hiddenTest(org.id)">'
+               + '<a href dropdown-toggle ng-click="orgChanged(org)"'
+                 + 'style="padding-left: {{org.depth * 10 + 5}}px">'
+                 + '{{org.shortname}}'
+               + '</a>'
+             + '</li>'
+           + '</ul>'
+          + '</div>',
 
         controller : ['$scope','$timeout','egOrg','egAuth',
               function($scope , $timeout , egOrg , egAuth) {
-- 
2.11.0