LP#1554714: fix up more drop-down menus

This patch intentionally doesn't change templates
under cat/; that will come later.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2 b/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2
index 66bc9b4..f3471a6 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2
@@ -28,12 +28,12 @@ you wish to age to a Lost status.  Note the descendants of these values
   <div xclass="form-inline">
     <div class="form-group">
       <label class="col-md-2">[% l('User Profile') %]</label>
-      <div class="btn-group" dropdown>
-        <button type="button" class="btn btn-default dropdown-toggle">
+      <div class="btn-group" uib-dropdown>
+        <button type="button" class="btn btn-default" uib-dropdown-toggle>
           <span style="padding-right: 5px;">{{selected_profile.name()}}</span>
           <span class="caret"></span>
         </button>
-        <ul class="dropdown-menu">
+        <ul uib-dropdown-menu>
           <li ng-repeat="grp in profiles">
             <a href
               style="padding-left: {{pgt_depth(grp) * 10 + 5}}px"

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
index 06067ac..ef5dafb 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
@@ -48,11 +48,11 @@
           <div class="row" ng-hide="isTestView">
             <div class="col-md-6">
               <div class="input-group">
-                <div class="input-group-btn" dropdown>
-                  <button type="button" class="btn btn-default dropdown-toggle">
+                <div class="input-group-btn" uib-dropdown>
+                  <button type="button" class="btn btn-default" uib-dropdown-toggle>
                     [% l('Select Printer') %]
                     <span class="caret"></span></button>
-                  <ul class="dropdown-menu">
+                  <ul uib-dropdown-menu>
                     <li ng-repeat="printer in printers">
                       <a href='' ng-click="setPrinter(printer.name)">
                         {{printer.name}}

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 f6b81f2..9ce6ac7 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
@@ -135,12 +135,12 @@
     </div><!-- flex row -->
   </div><!-- col -->
   <div class="col-md-2">
-    <div class="input-group-btn" dropdown>
-      <button type="button" class="btn btn-default dropdown-toggle">
+    <div class="input-group-btn" uib-dropdown>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
         [% l('Checkin Modifiers') %]
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu pull-right">
+      <ul class="pull-right" uib-dropdown-menu>
         <li>
           <a href
             ng-click="toggle_mod('no_precat_alert')">

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 7946ce5..769d533 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
@@ -33,12 +33,12 @@
 
     <div class="col-md-6">
       <div class="input-group">
-        <div class="input-group-btn" dropdown>
-          <button type="button" class="btn btn-default dropdown-toggle">
+        <div class="input-group-btn" uib-dropdown>
+          <button type="button" class="btn btn-default" uib-dropdown-toggle>
             {{selectedNcType() || "[% l('Barcode') %]"}}
             <span class="caret"></span>
           </button>
-          <ul class="dropdown-menu">
+          <ul uib-dropdown-menu>
             <li><a href
               ng-click="args.noncat_type='barcode';bcFocus=true">
               [% l('Barcode') %]</a>

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index 85b8866..07c967e 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -122,12 +122,12 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
       <li ng-class="{active : tab == 'edit', disabled : !patron()}">
         <a href="./circ/patron/{{patron().id()}}/edit">[% l('Edit') %]</a>
       </li>
-      <li class="dropdown" ng-class="{active : tab == 'other', disabled : !patron()}">
-        <a a-disabled="!patron()" href class="dropdown-toggle" data-toggle="dropdown">
+      <li uib-dropdown ng-class="{active : tab == 'other', disabled : !patron()}">
+        <a a-disabled="!patron()" href uib-dropdown-toggle>
             [% l('Other') %]
             <b class="caret"></b>
         </a>
-        <ul class="dropdown-menu">
+        <ul uib-dropdown-menu>
           <li>
             <a href="./circ/patron/{{patron().id()}}/alerts">
               [% l('Display Alert and Messages') %]

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 fb590a6..29974aa 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -5,13 +5,13 @@
     <form ng-submit="checkout(checkoutArgs)" role="form" class="form-inline">
       <div class="input-group">
 
-        <div class="input-group-btn" dropdown>
-          <button type="button" class="btn btn-default dropdown-toggle"
+        <div class="input-group-btn" uib-dropdown>
+          <button type="button" class="btn btn-default" uib-dropdown-toggle
             ng-class="{disabled : disable_checkout()}">
             {{selectedNcType() || "[% l('Barcode') %]"}}
             <span class="caret"></span>
           </button>
-          <ul class="dropdown-menu">
+          <ul uib-dropdown-menu>
             <li><a href
               ng-click="checkoutArgs.noncat_type='barcode';focusMe=true">
               [% l('Barcode') %]</a>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 5d94abe..c7427a0 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -407,15 +407,15 @@ within the "form" by name for validation.
 <div class="row reg-field-row" ng-show="show_field('au.profile')">
   [% draw_field_label('au', 'profile') %]
   <div class="col-md-3 reg-field-input">
-    <div class="btn-group" dropdown>
-      <button type="button" class="btn btn-default dropdown-toggle"
+    <div class="btn-group" uib-dropdown>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle
           ng-class="{'ng-invalid' : invalid_profile()}">
         <span style="padding-right: 5px;">
           {{patron.profile.name() || "[% l('Profile Group') %]"}}
         </span>
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu">
+      <ul uib-dropdown-menu>
         <li ng-repeat="grp in edit_profiles" 
           ng-class="{disabled : grp.usergroup() == 'f'}">
           <a href 
@@ -641,12 +641,12 @@ within the "form" by name for validation.
     <label>[% l('Default SMS Carrier') %]</label>
   </div>
   <div class="col-md-3 reg-field-input">
-    <div class="btn-group" dropdown>
-      <button type="button" class="btn btn-default dropdown-toggle">
+    <div class="btn-group" uib-dropdown>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
         <span style="padding-right: 5px;"></span>
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu">
+      <ul uib-dropdown-menu>
         <li ng-repeat="carrier in sms_carriers">
           <a href 
             ng-click="field_modified();user_settings['opac.default_sms_carrier'] = carrier">
@@ -859,13 +859,13 @@ within the "form" by name for validation.
     -->
     
     <div ng-if="cat.entries().length != 0">
-      <div class="btn-group" dropdown>
-        <button type="button" class="btn btn-default dropdown-toggle">
+      <div class="btn-group" uib-dropdown>
+        <button type="button" class="btn btn-default" uib-dropdown-toggle>
           <span style="padding-right: 5px;">
             {{stat_cat_entry_maps[cat.id()]}}</span>
           <span class="caret"></span>
         </button>
-        <ul class="dropdown-menu">
+        <ul uib-dropdown-menu>
           <li ng-repeat="entry in cat.entries()">
             <a href 
               ng-click="field_modified();stat_cat_entry_maps[cat.id()]=entry.value()"> 
@@ -901,14 +901,14 @@ within the "form" by name for validation.
       style="margin-bottom: 10px;">
       <div class="col-md-6">{{question.question()}}</div>
       <div class="col-md-6">
-        <div class="btn-group" dropdown>
-          <button type="button" class="btn btn-default dropdown-toggle">
+        <div class="btn-group" uib-dropdown>
+          <button type="button" class="btn btn-default" uib-dropdown-toggle>
             <span style="padding-right: 5px;">
               {{survey_responses[question.id()].answer()}}
             </span>
             <span class="caret"></span>
           </button>
-          <ul class="dropdown-menu">
+          <ul uib-dropdown-menu>
             <li ng-repeat="answer in question.answers()">
               <a href 
                 ng-click="field_modified();survey_responses[question.id()] = answer"> 

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_patron_groups_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_patron_groups_dialog.tt2
index 5dd8f3e..7c7f6b0 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_patron_groups_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_patron_groups_dialog.tt2
@@ -29,12 +29,12 @@ This does not affect circulation policy.
       </div>
       <div class="row pad-all-min">
         <div class="col-md-6">
-            <div class="btn-group" dropdown>
-              <button type="button" class="btn btn-default dropdown-toggle">
+            <div class="btn-group" uib-dropdown>
+              <button type="button" class="btn btn-default" uib-dropdown-toggle>
                 <span style="padding-right: 5px;">{{args.new_profile.name()}}</span>
                 <span class="caret"></span>
               </button>
-              <ul class="dropdown-menu scrollable-menu">
+              <ul class="scrollable-menu" uib-dropdown-menu>
                 <li ng-repeat="grp in args.edit_profiles">
                   <a href
                     style="padding-left: {{pgt_depth(grp) * 10 + 5}}px"

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_search.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_search.tt2
index 9304b33..bcbda5a 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_search.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_search.tt2
@@ -115,12 +115,12 @@
             typeahead-editable="false" />
             -->
 
-            <div class="btn-group patron-search-selector" dropdown>
-              <button type="button" class="btn btn-default dropdown-toggle">
+            <div class="btn-group patron-search-selector" uib-dropdown>
+              <button type="button" class="btn btn-default" uib-dropdown-toggle>
                 <span style="padding-right: 5px;">{{searchArgs.profile.name() || "[% l('Profile Group') %]"}}</span>
                 <span class="caret"></span>
               </button>
-              <ul class="dropdown-menu">
+              <ul uib-dropdown-menu>
                 <li ng-repeat="grp in profiles">
                   <a href
                     style="padding-left: {{pgt_depth(grp) * 10 + 5}}px"

diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index e96e2fb..82fa3b2 100644 (file)
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -9,11 +9,11 @@
   <div class="eg-grid-primary-label">{{mainLabel}}</div>
 
   <div class="btn-group" 
-    is-open="gridMenuIsOpen" ng-if="menuLabel && showMenu" dropdown>
-    <button type="button" class="btn btn-default dropdown-toggle eg-grid-menu-item">
+    is-open="gridMenuIsOpen" ng-if="menuLabel && showMenu" uib-dropdown>
+    <button type="button" class="btn btn-default eg-grid-menu-item" uib-dropdown-toggle>
       {{menuLabel}}<span class="caret"></span>
     </button>
-    <ul class="dropdown-menu scrollable-menu">
+    <ul class="scrollable-menu" uib-dropdown-menu>
       <li ng-repeat="item in menuItems | filter : { standalone : 'false' }" ng-class="{divider: item.divider}">
         <a ng-if="!item.divider" href a-disabled="item.disabled()"
           ng-click="item.handler()">{{item.label}}</a>
@@ -85,11 +85,11 @@
     </button>
 
     <!-- actions drop-down menu -->
-    <div class="btn-group" ng-show="showActions" ng-if="actionGroups.length > 1 || actionGroups[0].actions.length" dropdown>                                                  
-      <button type="button" class="btn btn-default dropdown-toggle">
+    <div class="btn-group" ng-show="showActions" ng-if="actionGroups.length > 1 || actionGroups[0].actions.length" uib-dropdown>                                                  
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
         [% l('Actions') %] <span class="caret"></span>                       
       </button>                                                              
-      <ul class="dropdown-menu pull-right grid-action-dropdown scrollable-menu">                                  
+      <ul class="pull-right grid-action-dropdown scrollable-menu" uib-dropdown-menu>
         <li ng-repeat-start="group in actionGroups">
           <span style="padding-left: 1em;" ng-if="group.label"><strong><u>{{group.label}}</u></strong></span>
         </li>
@@ -101,13 +101,13 @@
       </ul>
     </div>
 
-    <div class="btn-group" dropdown is-open="gridRowCountIsOpen" ng-show="showPagination">
+    <div class="btn-group" uib-dropdown is-open="gridRowCountIsOpen" ng-show="showPagination">
       <button type="button" title="[% l('Select Row Count') %]"
-        class="btn btn-default dropdown-toggle">
+        class="btn btn-default" uib-dropdown-toggle>
         [% l('Rows [_1]', '{{limit()}}') %]
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu">
+      <ul uib-dropdown-menu>
         <li ng-repeat="t in [5,10,25,50,100]">
           <a href ng-click='offset(0);limit(t);collect()'>
             {{t}}
@@ -119,13 +119,13 @@
       </ul>
     </div>
 
-    <div class="btn-group" dropdown is-open="gridPageSelectIsOpen" ng-show="showPagination">
+    <div class="btn-group" uib-dropdown is-open="gridPageSelectIsOpen" ng-show="showPagination">
       <button type="button" title="[% l('Select Page') %]"
-        class="btn btn-default dropdown-toggle">
+        class="btn btn-default" uib-dropdown-toggle>
         [% l('Page [_1]', '{{page()}}') %]
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu">
+      <ul uib-dropdown-menu>
         <li>
           <div class="input-group">
             <input type="text" class="form-control"
@@ -146,12 +146,12 @@
       </ul>
     </div>
 
-    <div class="btn-group" dropdown is-open="gridColumnPickerIsOpen" ng-show="showPicker">
+    <div class="btn-group" uib-dropdown is-open="gridColumnPickerIsOpen" ng-show="showPicker">
       <button type="button" 
-        class="btn btn-default dropdown-toggle">
+        class="btn btn-default" uib-dropdown-toggle>
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu pull-right eg-grid-column-picker">
+      <ul class="pull-right eg-grid-column-picker" uib-dropdown-menu>
         <li><a href ng-click="toggleConfDisplay()">
           <span class="glyphicon glyphicon-wrench"></span>
           [% l('Configure Columns') %]