LP#1570091: webstaff: add tree control and a simple toaster for notifications

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

diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2
index 9f92d3d..1e2c740 100644 (file)
--- a/Open-ILS/src/templates/staff/base.tt2
+++ b/Open-ILS/src/templates/staff/base.tt2
@@ -11,6 +11,10 @@
     [% IF EXPAND_WEB_IMPORTS %]
     <link rel="stylesheet" href="[% WEB_BUILD_PATH %]/css/bootstrap.min.css" />
     <link rel="stylesheet" href="[% WEB_BUILD_PATH %]/css/hotkeys.min.css" />
+    <link rel="stylesheet" href="[% WEB_BUILD_PATH %]/css/ngToast.min.css" />
+    <link rel="stylesheet" href="[% WEB_BUILD_PATH %]/css/ngToast-animations.min.css" />
+    <link rel="stylesheet" href="[% WEB_BUILD_PATH %]/css/tree-control.css" />
+    <link rel="stylesheet" href="[% WEB_BUILD_PATH %]/css/tree-control-attribute.css" />
     [% ELSE %]
     <link rel="stylesheet" href="[% WEB_BUILD_PATH %]/css/evergreen-staff-client-deps.[% EVERGREEN_VERSION %].min.css" />
     [% END %]

diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index c2b1abb..4b2861a 100644 (file)
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -10,6 +10,8 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/hotkeys.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-file-saver.bundle.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-location-update.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ngToast.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-tree-control.js"></script>
 
 <!-- IDL / opensrf (network) -->
 <script src="[% ctx.media_prefix %]/js/dojo/opensrf/JSON_v1.js"></script>

diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
index 2c0d289..796c616 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js
+++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
@@ -24,6 +24,8 @@ module.exports = function(grunt) {
             'bower_components/angular-hotkeys/build/hotkeys.min.js',
             'bower_components/angular-file-saver/dist/angular-file-saver.bundle.min.js',
             'bower_components/angular-location-update/angular-location-update.min.js',
+            'bower_components/angular-tree-control/angular-tree-control.js',
+            'bower_components/ngtoast/dist/ngToast.min.js',
             'bower_components/jquery/dist/jquery.min.js',
           ]
         }]
@@ -37,7 +39,11 @@ module.exports = function(grunt) {
           expand : true,
           src : [
             'bower_components/angular-hotkeys/build/hotkeys.min.css',
-            'bower_components/bootstrap/dist/css/bootstrap.min.css' 
+            'bower_components/bootstrap/dist/css/bootstrap.min.css', 
+            'bower_components/ngtoast/dist/ngToast.min.css',
+            'bower_components/ngtoast/dist/ngToast-animations.min.css',
+            'bower_components/angular-tree-control/css/tree-control.css',
+            'bower_components/angular-tree-control/css/tree-control-attribute.css',
           ]
         }]
       },
@@ -65,7 +71,11 @@ module.exports = function(grunt) {
         files: {
           'build/css/evergreen-staff-client-deps.<%= pkg.version %>.min.css' : [
             'build/css/hotkeys.min.css',
-            'build/css/bootstrap.min.css'
+            'build/css/bootstrap.min.css',
+            'build/css/ngToast.min.css',
+            'build/css/ngToast-animations.min.css',
+            'build/css/tree-control.css',
+            'build/css/tree-control-attribute.css',
           ]
         }
       }
@@ -86,6 +96,8 @@ module.exports = function(grunt) {
             'build/js/ui-bootstrap.min.js',
             'build/js/ui-bootstrap-tpls.min.js',
             'build/js/hotkeys.min.js',
+            'build/js/angular-tree-control.js',
+            'build/js/ngToast.min.js',
             // NOTE: OpenSRF must be installed
             '/openils/lib/javascript/JSON_v1.js',
             '/openils/lib/javascript/opensrf.js',

diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json
index fd1c566..0e9414e 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@ -28,6 +28,8 @@
   "dependencies": {
     "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.3.0",
     "angular-location-update": "./extern/angular-location-update/",
-    "angular-file-saver": "~1.0.2"
+    "angular-file-saver": "~1.0.2",
+    "ngtoast": "~2.0.0",
+    "angular-tree-control": "~0.2.23"
   }
 }