update dropdowns to match ang-bs reqs; shorten conf names

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_printing.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_printing.tt2
index 48237f8..f90fc01 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/workstation/t_printing.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_printing.tt2
@@ -48,9 +48,9 @@
           <div class="row" ng-hide="isTestView">
             <div class="col-md-6">
               <div class="input-group">
-                <div class="input-group-btn">
-                  <button type="button" class="btn btn-default dropdown-toggle" 
-                    data-toggle="dropdown">[% l('Select Printer') %]
+                <div class="input-group-btn" dropdown>
+                  <button type="button" class="btn btn-default dropdown-toggle">
+                    [% l('Select Printer') %]
                     <span class="caret"></span></button>
                   <ul class="dropdown-menu">
                     <li ng-repeat="printer in printers">

diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_bucket_selector.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_bucket_selector.tt2
index 1e34f6a..37eef80 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_bucket_selector.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_bucket_selector.tt2
@@ -1,5 +1,5 @@
-<div class="btn-group text-left">
-  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+<div class="btn-group text-left" dropdown>
+  <button type="button" class="btn btn-default dropdown-toggle">
     [% l('Buckets') %]<span class="caret"></span>
   </button>
   <ul class="dropdown-menu">

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 5b44858..d65b7d3 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,9 +5,8 @@
     <form ng-submit="checkout(checkoutArgs)" role="form" class="form-inline">
       <div class="input-group">
 
-        <div class="input-group-btn">
-          <button type="button" data-toggle="dropdown"
-            class="btn btn-default dropdown-toggle">
+        <div class="input-group-btn" dropdown>
+          <button type="button" class="btn btn-default dropdown-toggle">
             {{selectedNcType() || "[% l('Barcode') %]"}}
             <span class="caret"></span>
           </button>

diff --git a/Open-ILS/src/templates/staff/parts/column_picker.tt2 b/Open-ILS/src/templates/staff/parts/column_picker.tt2
index c690de6..49bd38e 100644 (file)
--- a/Open-ILS/src/templates/staff/parts/column_picker.tt2
+++ b/Open-ILS/src/templates/staff/parts/column_picker.tt2
@@ -9,9 +9,9 @@ dropdowns, etc. to the btn-group
 <div>
 %]
 
-<div class="btn-group column-picker">
-  <button type="button" class="btn btn-default dropdown-toggle" 
-    data-toggle="dropdown"> <span class="caret"></span>
+<div class="btn-group column-picker" dropdown>
+  <button type="button" class="btn btn-default dropdown-toggle">
+    <span class="caret"></span>
   </button>
   <ul class="dropdown-menu pull-right">
     <li ng-repeat="col in [% listname %].allColumns">

diff --git a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
index bdea007..6a8107b 100644 (file)
--- a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
@@ -10,9 +10,8 @@
     <div class="eg-grid-primary-label">{{mainLabel}}</div>
   </div>
 
-  <div class="btn-group" ng-if="menuLabel" style="margin-right: 10px">
-    <button type="button" 
-      class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+  <div class="btn-group" ng-if="menuLabel" dropdown style="margin-right: 10px">
+    <button type="button" class="btn btn-default dropdown-toggle">
       {{menuLabel}}<span class="caret"></span>
     </button>
     <ul class="dropdown-menu">
@@ -22,7 +21,7 @@
       </li>
     </ul>
   </div>
-  
+
   <!-- column picker, pager, etc. -->
   <div class="btn-group column-picker">
 
@@ -52,9 +51,9 @@
     </button>
 
     <!-- actions drop-down menu -->
-    <div class="btn-group" ng-if="actions.length">                                                  
-      <button type="button" class="btn btn-default dropdown-toggle"          
-          ng-class="{disabled : false}" data-toggle="dropdown">     
+    <div class="btn-group" ng-if="actions.length" dropdown>                                                  
+      <button type="button" class="btn btn-default dropdown-toggle"
+        ng-class="{disabled : false}">
         [% l('Actions') %] <span class="caret"></span>                       
       </button>                                                              
       <ul class="dropdown-menu pull-right">                                  
@@ -64,9 +63,9 @@
       </ul>
     </div>
 
-    <div class="btn-group">
+    <div class="btn-group" dropdown>
       <button type="button" title="[% ('Select Row Count') %]"
-        class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+        class="btn btn-default dropdown-toggle">
         [% l('Rows [_1]', '{{limit()}}') %]
         <span class="caret"></span>
       </button>
@@ -79,9 +78,9 @@
       </ul>
     </div>
 
-    <div class="btn-group">
+    <div class="btn-group" dropdown>
       <button type="button" title="[% ('Select Page') %]"
-        class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+        class="btn btn-default dropdown-toggle">
         [% l('Page [_1]', '{{page()}}') %]
         <span class="caret"></span>
       </button>
@@ -106,9 +105,10 @@
       </ul>
     </div>
 
+    <div class="btn-group" dropdown>
     <button type="button" 
-      class="btn btn-default dropdown-toggle" 
-      data-toggle="dropdown"><span class="caret"></span>
+      class="btn btn-default dropdown-toggle">
+      <span class="caret"></span>
     </button>
     <ul class="dropdown-menu pull-right">
       <li><a href='' ng-click="toggleConfDisplay()">
@@ -147,6 +147,7 @@
         </a>
       </li>
     </ul>
+    </div>
   </div>
 </div>
 

diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index 844e4c7..c074176 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -56,12 +56,12 @@ function($scope , $window , $location , egCore) {
     });
 
     // fetch the stored WS info
-    egCore.hatch.getItem('eg.conf.workstation.all')
+    egCore.hatch.getItem('eg.workstation.all')
     .then(function(all) {
         allWorkstations = all || [];
         $scope.workstations = 
             allWorkstations.map(function(w) { return w.name });
-        return egCore.hatch.getItem('eg.conf.workstation.default');
+        return egCore.hatch.getItem('eg.workstation.default');
     })
     .then(function(def) { 
         $scope.defaultWS = def;
@@ -75,7 +75,7 @@ function($scope , $window , $location , egCore) {
 
     $scope.setDefaultWS = function() {
         egCore.hatch.setItem(
-            'eg.conf.workstation.default', $scope.selectedWS)
+            'eg.workstation.default', $scope.selectedWS)
         .then(function() { $scope.defaultWS = $scope.selectedWS });
     }
 
@@ -113,7 +113,7 @@ function($scope , $window , $location , egCore) {
                 });
 
                 egCore.hatch.setItem(
-                    'eg.conf.workstation.all', allWorkstations)
+                    'eg.workstation.all', allWorkstations)
                 .then(function() {
                     if (allWorkstations.length == 1) {
                         // first one registerd, also mark it as the default
@@ -133,16 +133,16 @@ function($scope , $window , $location , egCore) {
     // Hatch Configs
     $scope.hatchURL = egCore.hatch.hatchURL();
     $scope.hatchRequired = 
-        egCore.hatch.getLocalItem('eg.conf.hatch.required');
+        egCore.hatch.getLocalItem('eg.hatch.required');
 
     $scope.updateHatchRequired = function() {
         egCore.hatch.setLocalItem(
-            'eg.conf.hatch.required', $scope.hatchRequired);
+            'eg.hatch.required', $scope.hatchRequired);
     }
 
     $scope.updateHatchURL = function() {
         egCore.hatch.setLocalItem(
-            'eg.conf.hatch.url', $scope.hatchURL);
+            'eg.hatch.url', $scope.hatchURL);
     }
 }])
 

diff --git a/Open-ILS/web/js/ui/default/staff/app.js b/Open-ILS/web/js/ui/default/staff/app.js
index 495d387..1c73cf3 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/app.js
+++ b/Open-ILS/web/js/ui/default/staff/app.js
@@ -50,7 +50,7 @@ function($routeProvider , $locationProvider) {
     function($scope , $location , $window , egCore) {
         $scope.focusMe = true;
 
-        egCore.hatch.getItem('eg.conf.workstation.all')
+        egCore.hatch.getItem('eg.workstation.all')
         .then(function(all) {
             if (all && all.length) {
                 $scope.workstations = all.map(function(a) { return a.name });
@@ -69,7 +69,7 @@ function($routeProvider , $locationProvider) {
                     }
                 } else {
                     // no workstation requested; use the default
-                    egCore.hatch.getItem('eg.conf.workstation.default')
+                    egCore.hatch.getItem('eg.workstation.default')
                     .then(function(ws) {
                         $scope.args = {workstation : ws}
                     });

diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json
index 99e5f37..8c2ed1f 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@ -22,7 +22,7 @@
     "angular": "~1.2.16",
     "angular-route": "~1.2.16",
     "angular-mocks": "~1.2.16",
-    "angular-bootstrap": "0.9.0"
+    "angular-bootstrap": "~0.11.0"
   },
   "dependencies": {
     "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.2.0"

diff --git a/Open-ILS/web/js/ui/default/staff/services/auth.js b/Open-ILS/web/js/ui/default/staff/services/auth.js
index 851ddc7..74bac05 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/auth.js
+++ b/Open-ILS/web/js/ui/default/staff/services/auth.js
@@ -47,7 +47,7 @@ angular.module('egCoreMod')
                         // user previously logged in with a workstation. 
                         // Find the workstation name from the list 
                         // of configured workstations
-                        egHatch.getItem('eg.conf.workstation.all')
+                        egHatch.getItem('eg.workstation.all')
                         .then(function(all) { 
                             if (all) {
                                 var ws = all.filter(

diff --git a/Open-ILS/web/js/ui/default/staff/services/hatch.js b/Open-ILS/web/js/ui/default/staff/services/hatch.js
index f1ebffd..821f868 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/hatch.js
+++ b/Open-ILS/web/js/ui/default/staff/services/hatch.js
@@ -141,7 +141,7 @@ angular.module('egCoreMod')
     }
 
     service.hatchURL = function() {
-        return service.getLocalItem('eg.conf.hatch.url') 
+        return service.getLocalItem('eg.hatch.url') 
             || service.defaultHatchURL;
     }