From bfa5271e981f4038f67e437d312a298cd201c4a3 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 9 May 2014 15:59:50 -0400 Subject: [PATCH] update dropdowns to match ang-bs reqs; shorten conf names Signed-off-by: Bill Erickson --- .../staff/admin/workstation/t_printing.tt2 | 6 ++--- .../staff/cat/bucket/record/t_bucket_selector.tt2 | 4 ++-- .../src/templates/staff/circ/patron/t_checkout.tt2 | 5 ++-- .../src/templates/staff/parts/column_picker.tt2 | 6 ++--- Open-ILS/src/templates/staff/parts/t_autogrid.tt2 | 27 +++++++++++----------- .../js/ui/default/staff/admin/workstation/app.js | 14 +++++------ Open-ILS/web/js/ui/default/staff/app.js | 4 ++-- Open-ILS/web/js/ui/default/staff/bower.json | 2 +- Open-ILS/web/js/ui/default/staff/services/auth.js | 2 +- Open-ILS/web/js/ui/default/staff/services/hatch.js | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) 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 48237f8817..f90fc01a3c 100644 --- 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 @@
-
-
  • 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 1e34f6a696..37eef805e4 100644 --- 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 @@ -
    -
      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 5b44858208..d65b7d3b4d 100644 --- 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 @@
      -
      - diff --git a/Open-ILS/src/templates/staff/parts/column_picker.tt2 b/Open-ILS/src/templates/staff/parts/column_picker.tt2 index c690de689d..49bd38e0a6 100644 --- 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
      %] -
      -
      • diff --git a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 index bdea007c42..6a8107b953 100644 --- a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 +++ b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 @@ -10,9 +10,8 @@
        {{mainLabel}}
      -
      -
        @@ -22,7 +21,7 @@
      - +
      @@ -52,9 +51,9 @@ -
      -
        @@ -64,9 +63,9 @@
      -
      +
      @@ -79,9 +78,9 @@
    -
    +
    @@ -106,9 +105,10 @@
+
+
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 844e4c78c6..c07417620c 100644 --- 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 495d387bb8..1c73cf358f 100644 --- 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 99e5f3779e..8c2ed1f4e6 100644 --- 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 851ddc7662..74bac05d8d 100644 --- 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 f1ebffd803..821f868988 100644 --- 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; } -- 2.11.0